mabaoyi 8 months ago
parent
commit
78e7e5d1ba
100 changed files with 1082 additions and 988 deletions
  1. 5 1
      commont/messages.js
  2. 20 2
      components/kj-tabbar/kj-tabbar.vue
  3. 31 22
      pageA/comment.vue
  4. 82 48
      pageA/order.vue
  5. 21 10
      pageA/productdetails.vue
  6. 1 1
      pageB/ParcelExpress.vue
  7. 24 54
      pageB/citychange.vue
  8. 1 19
      pageB/orderinfo.vue
  9. 94 15
      pageB/recipientinfo.vue
  10. 723 799
      pages/cart/cart.vue
  11. 19 10
      uni_modules/liu-indexed-list/components/liu-indexed-list/liu-indexed-list.vue
  12. 1 0
      unpackage/dist/build/mp-weixin/common/runtime.js
  13. 1 0
      unpackage/dist/build/mp-weixin/common/vendor.js
  14. 0 0
      unpackage/dist/build/mp-weixin/pageA/comment.js
  15. 1 1
      unpackage/dist/build/mp-weixin/pageA/comment.wxml
  16. 1 1
      unpackage/dist/build/mp-weixin/pageA/comment.wxss
  17. 0 0
      unpackage/dist/build/mp-weixin/pageA/counter.js
  18. 0 0
      unpackage/dist/build/mp-weixin/pageA/counter.wxml
  19. 0 0
      unpackage/dist/build/mp-weixin/pageA/logisticsinfo.js
  20. 0 0
      unpackage/dist/build/mp-weixin/pageA/order.js
  21. 0 0
      unpackage/dist/build/mp-weixin/pageA/order.wxml
  22. 0 0
      unpackage/dist/build/mp-weixin/pageA/payorder.js
  23. 0 0
      unpackage/dist/build/mp-weixin/pageA/productdetails.js
  24. 0 0
      unpackage/dist/build/mp-weixin/pageA/productdetails.wxml
  25. 0 0
      unpackage/dist/build/mp-weixin/pageA/productdetails.wxss
  26. 0 0
      unpackage/dist/build/mp-weixin/pageB/ParcelExpress.js
  27. 0 0
      unpackage/dist/build/mp-weixin/pageB/ParcelExpress.wxml
  28. 0 0
      unpackage/dist/build/mp-weixin/pageB/ParcelExpress.wxss
  29. 0 0
      unpackage/dist/build/mp-weixin/pageB/account.js
  30. 0 0
      unpackage/dist/build/mp-weixin/pageB/account.wxml
  31. 0 0
      unpackage/dist/build/mp-weixin/pageB/citychange.js
  32. 0 0
      unpackage/dist/build/mp-weixin/pageB/delivery.js
  33. 0 0
      unpackage/dist/build/mp-weixin/pageB/delivery.wxml
  34. 0 0
      unpackage/dist/build/mp-weixin/pageB/end.js
  35. 0 0
      unpackage/dist/build/mp-weixin/pageB/end.wxml
  36. 0 0
      unpackage/dist/build/mp-weixin/pageB/goods.js
  37. 0 0
      unpackage/dist/build/mp-weixin/pageB/goods.wxml
  38. 5 1
      unpackage/dist/build/mp-weixin/pageB/orderinfo.js
  39. 0 0
      unpackage/dist/build/mp-weixin/pageB/orderinfo.wxml
  40. 1 1
      unpackage/dist/build/mp-weixin/pageB/orderinfo.wxss
  41. 5 1
      unpackage/dist/build/mp-weixin/pageB/parcel.js
  42. 3 1
      unpackage/dist/build/mp-weixin/pageB/recipientinfo.js
  43. 2 1
      unpackage/dist/build/mp-weixin/pageB/recipientinfo.json
  44. 0 0
      unpackage/dist/build/mp-weixin/pageB/recipientinfo.wxml
  45. 0 0
      unpackage/dist/build/mp-weixin/pageC/applicationRefund/applicationRefund.js
  46. 1 0
      unpackage/dist/build/mp-weixin/pageC/myPackage/component/packageCard.js
  47. 1 0
      unpackage/dist/build/mp-weixin/pageC/orderForm/component/orderInofrmation.js
  48. 0 0
      unpackage/dist/build/mp-weixin/pageC/orderForm/orderForm.js
  49. 1 0
      unpackage/dist/build/mp-weixin/pageC/orderFormDetail/component/commodityDetail.js
  50. 0 0
      unpackage/dist/build/mp-weixin/pageC/orderFormDetail/orderFormDetail.js
  51. 4 0
      unpackage/dist/build/mp-weixin/pageC/refundDetail/component/moneyDestination.js
  52. 4 0
      unpackage/dist/build/mp-weixin/pageC/refundDetail/component/refundInProgress.js
  53. 4 0
      unpackage/dist/build/mp-weixin/pageC/refundDetail/component/refundSuccessful.js
  54. 4 0
      unpackage/dist/build/mp-weixin/pageC/refundDetail/component/refusalToRefund.js
  55. 0 0
      unpackage/dist/build/mp-weixin/pageC/refundDetail/refundDetail.js
  56. 0 0
      unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/afterSalesDetail.js
  57. 4 0
      unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/component/applicationInformation.js
  58. 1 0
      unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/component/commodityDetail.js
  59. 4 0
      unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/component/refusePopup.js
  60. 0 0
      unpackage/dist/build/mp-weixin/pageD/afterSalesManage/afterSalesManage.js
  61. 0 0
      unpackage/dist/build/mp-weixin/pageD/commodityManage/commodityManage.js
  62. 4 0
      unpackage/dist/build/mp-weixin/pageD/commodityManage/component/goodsInformation.js
  63. 4 0
      unpackage/dist/build/mp-weixin/pageD/components/agreePopup.js
  64. 4 0
      unpackage/dist/build/mp-weixin/pageD/components/goodsInformation.js
  65. 0 0
      unpackage/dist/build/mp-weixin/pageD/orderDetail/orderDetail.js
  66. 0 0
      unpackage/dist/build/mp-weixin/pageD/paymentOrder/paymentOrder.js
  67. 0 0
      unpackage/dist/build/mp-weixin/pageD/productDetails/productDetails.js
  68. 0 0
      unpackage/dist/build/mp-weixin/pageD/supplyChainGoods/supplyChainGoods.js
  69. 0 0
      unpackage/dist/build/mp-weixin/pages/express/express.js
  70. 0 0
      unpackage/dist/build/mp-weixin/pages/express/express.wxml
  71. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.js
  72. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.wxml
  73. 1 0
      unpackage/dist/build/mp-weixin/uni_modules/liu-indexed-list/components/liu-indexed-list/liu-indexed-list.js
  74. 0 0
      unpackage/dist/build/mp-weixin/uni_modules/liu-indexed-list/components/liu-indexed-list/liu-indexed-list.wxml
  75. 0 0
      unpackage/dist/build/mp-weixin/uni_modules/liu-indexed-list/components/liu-indexed-list/liu-indexed-list.wxss
  76. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  77. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  78. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-chat/kj-chat.js.map
  79. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-flow/kj-flow.js.map
  80. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-tabbar/kj-tabbar.js.map
  81. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.js.map
  82. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/changelange.js.map
  83. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/chat.js.map
  84. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/chat/news.js.map
  85. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/comment.js.map
  86. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/confirm.js.map
  87. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/counter.js.map
  88. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/index.js.map
  89. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/logisticsinfo.js.map
  90. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/order.js.map
  91. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/payorder.js.map
  92. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/productdetails.js.map
  93. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/rule/rule.js.map
  94. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/service/service.js.map
  95. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/shoplist.js.map
  96. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/shoptype.js.map
  97. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/subsidy.js.map
  98. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/ParcelExpress.js.map
  99. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/Senderinfor.js.map
  100. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageB/account.js.map

+ 5 - 1
commont/messages.js

@@ -295,7 +295,11 @@ export default {
 			Filling: '填写准确的寄送物品可帮助您推荐更合适的产品',
 			Note: '注:实际重量体积以收派员确定为准,物品在包装后重量可能会增加,重量小体积大时会按体积重量收费',
 			
-			window:'请点击右上角浮窗进行复制'
+			window:'请点击右上角浮窗进行复制',
+			Recent :'最近使用',
+			nodata:'暂无数据',
+			Pleasecountry:'请先选择国家',
+			
 		},
 	},
 	//英语

+ 20 - 2
components/kj-tabbar/kj-tabbar.vue

@@ -38,6 +38,9 @@
 </template>
 <script>
 	import {
+		nextTick
+	} from "vue";
+	import {
 		mapState
 	} from "vuex";
 
@@ -81,6 +84,7 @@
 				success: true,
 				all: [],
 				language: 'zh-CN',
+				selegoods: []
 			};
 		},
 		onLoad() {},
@@ -140,10 +144,24 @@
 		methods: {
 			account() {
 				console.log(this.checkboxValue1);
+				var stringcheck = this.checkboxValue1.toString()
 				console.log(this.goodsList);
-				uni.navigateTo({
-					url: "/pageA/order",
+				this.selegoods = []
+				this.goodsList.map((item) => {
+					item.goods.map((items) => {
+						if (this.checkboxValue1.indexOf(items.cart.sku_item_id) > -1) {
+							// item.selegoods
+							this.selegoods = this.selegoods.concat(items)
+						}
+					});
 				});
+				this.$nextTick(() => {
+					uni.navigateTo({
+						url: "/pageA/order?selelist=" + encodeURIComponent(JSON.stringify(this
+							.selegoods)) + '&typea=' + 'shop' + '&goodsPrice=' + this.goodsPrice +
+							'&goodsWeight=' + this.goodsWeight + '&stringcheck=' + stringcheck,
+					});
+				})
 			},
 			getLabelHeight() {
 				const dom = uni.createSelectorQuery("#tabber");

+ 31 - 22
pageA/comment.vue

@@ -1,30 +1,36 @@
 <template>
 	<!-- 评论 -->
 	<view class="back">
-		<view class="box" v-for="(item,idx) in commentlist" :key="idx">
-			<!-- 顶部 -->
-			<view class="" style="display: flex;justify-content: space-between;">
-				<view class="u-flex">
-					<image style="width: 68rpx;height: 68rpx;border: radius 34rpx;;" :src="item.member.avatar" mode="">
-					</image>
-					<view class="">
-						<text
-							class="name">{{item.member.nickname.slice(0,1)+'***'+item.member.nickname.slice(-1)}}</text>
-						<uni-rate network allow-half :readonly="true" color="rgba(247, 181, 0, 1)" :size='8' :value="5"
-							v-model="rate" />
+		<view class="" v-if="commentlist.length >0">
+			<view class="box" v-for="(item,idx) in commentlist" :key="idx">
+				<!-- 顶部 -->
+				<view class="" style="display: flex;justify-content: space-between;">
+					<view class="u-flex">
+						<image style="width: 68rpx;height: 68rpx;border: radius 34rpx;;" :src="item.member.avatar"
+							mode="">
+						</image>
+						<view class="">
+							<text
+								class="name">{{item.member.nickname.slice(0,1)+'***'+item.member.nickname.slice(-1)}}</text>
+							<uni-rate network allow-half :readonly="true" color="rgba(247, 181, 0, 1)" :size='8'
+								:value="5" v-model="rate" />
+						</view>
 					</view>
+					<text class="day">{{timeSince(item.created_at)}}</text>
+				</view>
+				<view class="day" style="margin-top: 24rpx;">{{item.sku_item.item}}</view>
+				<view class="content" style="margin-top: 20rpx;">{{item.content}}</view>
+				<!-- <view class="" v-for="(child,index) in item.image.split(',')" :key="index" style="margin-top: 22rpx;"> -->
+				<view class="u-flex u-row-between" style="margin-top: 22rpx;flex-wrap: wrap;" v-if="item.image">
+					<image v-for="(child,index) in item.image.split(',')" :key="index" :src="child"
+						style="margin-bottom: 20rpx; width: 326rpx;height: 326rpx;border-radius: 12rpx;background: #D8D8D8;"
+						mode=""></image>
 				</view>
-				<text class="day">{{timeSince(item.created_at)}}</text>
-			</view>
-			<view class="day" style="margin-top: 24rpx;">{{item.sku_item.item}}</view>
-			<view class="content" style="margin-top: 20rpx;">{{item.content}}</view>
-			<!-- <view class="" v-for="(child,index) in item.image.split(',')" :key="index" style="margin-top: 22rpx;"> -->
-			<view class="u-flex u-row-between" style="margin-top: 22rpx;flex-wrap: wrap;">
-				<image v-for="(child,index) in item.image.split(',')" :key="index" :src="child"
-					style="margin-bottom: 20rpx; width: 326rpx;height: 326rpx;border-radius: 12rpx;background: #D8D8D8;"
-					mode=""></image>
 			</view>
 		</view>
+		<view class="" style="height: 400rpx;text-align: center;line-height: 400rpx;">
+			暂无数据
+		</view>
 	</view>
 </template>
 
@@ -41,6 +47,9 @@
 			this.merchant_goods_id = options.id
 			this.comment()
 		},
+		onshow() {
+
+		},
 		computed: {
 			i18n() {
 				return this.$t('index')
@@ -52,10 +61,10 @@
 				uni.$u.http.post('/api/goods/goods_comment', {
 					merchant_goods_id: this.merchant_goods_id,
 					page: 1,
-					limit: 2
+					limit: 10
 				}).then((res) => {
+					console.log(res);
 					this.commentlist = res.data
-					this.total = res.total
 				}).catch(() => {
 
 				})

+ 82 - 48
pageA/order.vue

@@ -14,40 +14,60 @@
 		</view>
 		<!-- 商品 -->
 		<view class="shop">
-			<view class="">
-				<image :src="goodinfo.merchant.image" style="width: 38rpx;height: 38rpx;" mode=""></image>
-				<text class="name">{{goodinfo.merchant.merchant_name}}</text>
-			</view>
-			<view class="u-flex" style="margin-top: 32rpx;">
-				<image :src="sku_info.image" style="width: 184rpx;height: 184rpx;" mode=""></image>
-				<view class=" "
-					style="margin-left: 20rpx;flex-direction: column;justify-content: space-between;height: 184rpx;display: flex;flex:1">
-					<view class="">
-						<text class="toptitle">{{goodinfo.name_cn}}</text>
-						<view class="weight">{{sku_info.item}} </view>
-						<!-- <view class="">{{Number(sku_info.weight)*value}}kg</view> -->
-					</view>
-					<view class="u-flex u-row-between">
+			<view class="" v-if="typea=='shop'">
+				<view class="u-flex" style="margin-top: 32rpx;" v-for="(item,idx) in selelist" :key="idx">
+					<image :src="item.image" style="width: 184rpx;height: 184rpx;" mode=""></image>
+					<view class=" "
+						style="margin-left: 20rpx;flex-direction: column;justify-content: space-between;height: 184rpx;display: flex;flex:1">
 						<view class="">
-							<text class="money">¥</text>
-							<text class="money"
-								style="font-size: 34rpx;">{{goodinfo.is_discount==1? (Number(sku_info.price*1000)*Number(value*1000))/1000000:(Number(sku_info.discount_price*1000)*Number(value)*1000)/1000000}}</text>
+							<text class="toptitle">{{item.name_cn}}</text>
+							<view class="weight">{{item.sku_item[0].item}} </view>
 						</view>
-						<u-number-box v-model="value">
-							<!-- <view class="bu"> -->
-							<view slot="minus" class="">
-								<u-icon name="minus" size="12"></u-icon>
+						<view class="u-flex u-row-between">
+							<view class="">
+								<text class="money">¥</text>
+								<text class="money" style="font-size: 34rpx;">{{item.sku_item[0].price}}</text>
 							</view>
-							<input slot="input" v-model="value" style="width: 40px;text-align: center;"
-								class="input"></input>
-							<view slot="plus" class="">
-								<u-icon name="plus" size="12"></u-icon>
+							<view class="">{{item.cart.goods_num}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="" v-else>
+				<view class="">
+					<image :src="goodinfo.merchant.image" style="width: 38rpx;height: 38rpx;" mode=""></image>
+					<text class="name">{{goodinfo.merchant.merchant_name}}</text>
+				</view>
+				<view class="u-flex" style="margin-top: 32rpx;">
+					<image :src="sku_info.image" style="width: 184rpx;height: 184rpx;" mode=""></image>
+					<view class=" "
+						style="margin-left: 20rpx;flex-direction: column;justify-content: space-between;height: 184rpx;display: flex;flex:1">
+						<view class="">
+							<text class="toptitle">{{goodinfo.name_cn}}</text>
+							<view class="weight">{{sku_info.item}} </view>
+							<!-- <view class="">{{Number(sku_info.weight)*value}}kg</view> -->
+						</view>
+						<view class="u-flex u-row-between">
+							<view class="">
+								<text class="money">¥</text>
+								<text class="money"
+									style="font-size: 34rpx;">{{goodinfo.is_discount==1? (Number(sku_info.price*1000)*Number(value*1000))/1000000:(Number(sku_info.discount_price*1000)*Number(value)*1000)/1000000}}</text>
 							</view>
-							<!-- </view> -->
-						</u-number-box>
+							<u-number-box v-model="value">
+								<view slot="minus" class="">
+									<u-icon name="minus" size="12"></u-icon>
+								</view>
+								<input slot="input" v-model="value" style="width: 40px;text-align: center;"
+									class="input"></input>
+								<view slot="plus" class="">
+									<u-icon name="plus" size="12"></u-icon>
+								</view>
+							</u-number-box>
+						</view>
 					</view>
 				</view>
 			</view>
+
 		</view>
 		<!-- 物流 -->
 		<view class="logistics u-flex u-row-between">
@@ -127,14 +147,18 @@
 		</view>
 		<view class="" style="height: 166rpx;"></view>
 		<view class="btn u-flex u-row-right">
-			<view class="">
-				<text class="kg">{{i18n.Atotalof}}{{Number(sku_info.weight) * value}}kg,</text>
+			<view class="u-flex">
+				<text v-if="typea == 'shop'">{{i18n.Atotalof}}{{goodsWeight}}kg,</text>
+				<text v-else class="kg">{{i18n.Atotalof}}{{Number(sku_info.weight) * value}}kg,</text>
 				<text>{{i18n.total}}:</text>
 				<text class="money" style="font-size: 28rpx;">¥</text>
-				<text class="money" v-if="goodinfo.is_discount==1"
-					style="font-weight: bold;">{{(Number(sum*10000+ Number(sku_info.price)*Number(value)*10000))/10000}}</text>
-				<text class="money" v-if="goodinfo.is_discount==0"
-					style="font-weight: bold;">{{(Number(sum*10000+ Number(sku_info.discount_price)*Number(value)*10000))/10000}}</text>
+				<text style="font-weight: bold;" class="money" v-if="typea=='shop'">{{goodsPrice}}</text>
+				<view class="" v-else>
+					<text class="money" v-if="goodinfo.is_discount==1"
+						style="font-weight: bold;">{{(Number(sum*10000+ Number(sku_info.price)*Number(value)*10000))/10000}}</text>
+					<text class="money" v-if="goodinfo.is_discount==0"
+						style="font-weight: bold;">{{(Number(sum*10000+ Number(sku_info.discount_price)*Number(value)*10000))/10000}}</text>
+				</view>
 			</view>
 			<view class="order" @click="topay">
 				{{i18n.Submitorder}}
@@ -246,7 +270,12 @@
 				min_weight: '',
 				unit_fee: '',
 				addinfo: '',
-				huoid: ''
+				huoid: '',
+				selelist: [],
+				typea: '',
+				goodsPrice: '',
+				goodsWeight: '',
+				stringcheck: ''
 			};
 		},
 		computed: {
@@ -256,7 +285,15 @@
 		},
 		onLoad(options) {
 			// url: '/pageA/order?sku=' + this.sku_info + '&value=' + this.value+'&goodinfo='+this.goodinfo
-			if (options) {
+			if (options.typea) {
+				console.log(22222);
+				this.typea = options.typea
+				this.selelist = JSON.parse(decodeURIComponent(options.selelist))
+				this.goodsPrice = options.goodsPrice
+				this.goodsWeight = options.goodsWeight
+				this.stringcheck = options.stringcheck
+				console.log(this.selelist);
+			} else if (options) {
 				this.value = options.value
 				this.sku_info = JSON.parse(decodeURIComponent(options.sku));
 				this.goodinfo = JSON.parse(decodeURIComponent(options.goodinfo))
@@ -328,12 +365,11 @@
 			toadd() {
 				var that = this
 				uni.navigateTo({
-					url: '/pageC/addressManagement/addressManagement?tabs='+ Number(0),
+					url: '/pageC/addressManagement/addressManagement?tabs=' + Number(0),
 					events: {
 						getadd(res) {
 							that.addinfo = res
 							that.province_id = res.province_id
-							// console.log(res);
 							that.transport()
 						}
 					}
@@ -353,24 +389,22 @@
 						height: this.goodinfo.height, //		是	String	高
 					}
 				}).then((res) => {
-					console.log(res);
-					// this.containlist = res
-					this.containlist = []
 					res.forEach((item) => {
-						if (item.sum != 0) {
-							this.containlist.push(item)
-						}
+						// if (item.sum != 0) {
+						this.containlist.push(item)
+						// }
+						console.log(this.containlist);
 					})
 					// this.sum = this.containlist[0].sum
 					// this.unit_price = this.containlist[0].unit_price
-					if(this.goodinfo.is_shipping==0){
+					if (this.goodinfo.is_shipping == 0) {
 						this.sum = 0
-					}else{
+					} else {
 						this.sum = this.containlist[0].sum
 					}
-					if(this.goodinfo.is_shipping==0){
+					if (this.goodinfo.is_shipping == 0) {
 						this.unit_price = 0
-					}else{
+					} else {
 						this.unit_price = this.containlist[0].unit_price
 					}
 					this.recommend_weight = this.containlist[0].recommend_weight
@@ -500,7 +534,7 @@
 					goods_id: this.goodinfo.id, //65	是	String	商品id
 					goods_num: this.value, //2	是	String	商品数量
 					sku_item_id: this.sku_info.id, //60	是	String	规格id
-					cart_ids: '', //8,9	是	String	购物车id
+					cart_ids: this.stringcheck, //8,9	是	String	购物车id
 					remark: '', //备注	是	String	备注
 					merchant_goods_id: this.goodinfo.merchant_goods_id, //39	是	String	团长商品id
 					container_id: this.containid, //1	是	String	货柜id

+ 21 - 10
pageA/productdetails.vue

@@ -124,7 +124,7 @@
 					<view class="" v-for="(item, idx) in commentlist" :key="idx">
 						<view class="uesr u-flex u-row-between" style="margin-top: 36rpx">
 							<view class="u-flex">
-								<image src="../static/images/logo.png" style="width: 52rpx; height: 52rpx" mode="">
+								<image :src=" item.member.avatar " style="width: 52rpx; height: 52rpx" mode="">
 								</image>
 								<text class="name">{{ item.member.nickname }}</text>
 							</view>
@@ -228,7 +228,18 @@
 						</view>
 					</view>
 					<view class="" style="margin-top: 28rpx;">
-						<u-parse :content="goodinfo.detail_cn"></u-parse>
+						<view v-if="language == 'zh-CN'" class="">
+							<u-parse :content="goodinfo.detail_cn"></u-parse>
+						</view>
+						<view v-if="language == 'en-US'" class="">
+							<u-parse :content="goodinfo.detail_en"></u-parse>
+						</view>
+						<view v-if="language == 'es-ES'" class="">
+							<u-parse :content="goodinfo.detail_es"></u-parse>
+						</view>
+						<view v-if="language == 'it-IT'" class="">
+							<u-parse :content="goodinfo.detail_ita"></u-parse>
+						</view>
 						<!-- <image :src="goodinfo.image" style="width: 100%; height: 580rpx" mode=""></image> -->
 					</view>
 				</view>
@@ -572,18 +583,17 @@
 			//保存到手机相册
 			saveImage() {
 				var that = this
-				console.log('this.picture2.slice,-1)',this.picture2.slice(23));
+				console.log('this.picture2.slice,-1)', this.picture2.slice(23));
 				var fileManager = uni.getFileSystemManager();
 				fileManager.writeFile({
 					filePath: wx.env.USER_DATA_PATH + '/img.jpg', // 指定图片的临时路径
-					data:this.picture2.slice(23), // 要写入的文本或二进制数据
+					data: this.picture2.slice(23), // 要写入的文本或二进制数据
 					encoding: 'base64', // 指定写入文件的字符编码
 					success: res => {
-						console.log('写入文件成功', res)
 						console.log(wx.env.USER_DATA_PATH + '/img.jpg')
 						uni.saveImageToPhotosAlbum({ // 保存图片到相册
 							filePath: wx.env.USER_DATA_PATH + '/img.jpg',
-							success: function(res) { 
+							success: function(res) {
 								uni.showToast({
 									title: '保存成功'
 								})
@@ -593,7 +603,7 @@
 								console.log('保存失败', err)
 								that.imagea = false
 							},
-							
+
 						})
 					},
 					file: err => {
@@ -609,9 +619,10 @@
 				this.serve = true
 			},
 			returnindex() {
-				uni.switchTab({
-					url: '/pages/index/index'
-				})
+				// uni.switchTab({
+				// 	url: '/pages/index/index'
+				// })
+				uni.navigateBack()
 			},
 			chat() {
 				uni.navigateTo({

+ 1 - 1
pageB/ParcelExpress.vue

@@ -6,7 +6,7 @@
 			<image src="/static/images/index/back.png"
 				style="width: 750rpx;height: 1200rpx;position: absolute;top: 0;z-index: -1;left:-24rpx;" mode="">
 			</image>
-			<u-navbar :autoBack='true' title='寄快递' bgColor="rgba(248, 50, 36, 0.2)" :placeholder='true'
+			<u-navbar :autoBack='true' :title='i18n.delivery' bgColor="rgba(248, 50, 36, 0.2)" :placeholder='true'
 				:safeAreaInsetTop="true" style="position: absolute;z-index: 110;background-color: rgba(0,0,0,0);">
 				<view class="u-nav-slot" slot="left" style="display: flex;">
 					<u-icon name="arrow-left" color="rgba(0, 0, 0, 1)" size="24" @click="uni.navigateBack()"></u-icon>

+ 24 - 54
pageB/citychange.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- 选择城市 -->
 	<view class="page-main">
-		<liu-indexed-list :dataList="dataList" @click="click"></liu-indexed-list>
+		<liu-indexed-list :dataList="dataList"  @click="click"></liu-indexed-list>
 	</view>
 </template>
 
@@ -9,64 +9,34 @@
 	export default {
 		data() {
 			return {
-				dataList: [{
-					id: '1',
-					name: '刘**',
-					phone: '181****5576',
-					img: 'https://cdn.pixabay.com/photo/2022/03/31/14/53/camp-7103189_1280.png'
-				}, {
-					id: '2',
-					name: '税**',
-					phone: '181****5576',
-					img: 'https://cdn.pixabay.com/photo/2021/07/22/11/25/rabbit-6485072_1280.jpg'
-				}, {
-					id: '3',
-					name: '柴**',
-					phone: '181****5576',
-					img: 'https://cdn.pixabay.com/photo/2020/05/19/13/35/cartoon-5190860_1280.jpg'
-				}, {
-					id: '4',
-					name: '王**',
-					phone: '181****5576',
-					img: 'https://cdn.pixabay.com/photo/2020/05/19/13/32/cartoon-5190837_1280.jpg'
-				}, {
-					id: '5',
-					name: '马**',
-					phone: '181****5576',
-					img: 'https://cdn.pixabay.com/photo/2023/03/07/12/45/child-7835677_1280.jpg'
-				}, {
-					id: '6',
-					name: '韩**',
-					phone: '181****5576',
-					img: 'https://cdn.pixabay.com/photo/2022/11/29/19/05/boho-7625140_1280.jpg'
-				}, {
-					id: '7',
-					name: '张**',
-					phone: '181****5576',
-					img: 'https://cdn.pixabay.com/photo/2020/05/19/13/32/cartoon-5190837_1280.jpg'
-				}, {
-					id: '8',
-					name: '王**',
-					phone: '181****5576',
-					img: 'https://cdn.pixabay.com/photo/2020/05/19/13/35/cartoon-5190860_1280.jpg'
-				}, {
-					id: '9',
-					name: '张**',
-					phone: '18198045576',
-					img: 'https://cdn.pixabay.com/photo/2021/07/22/11/25/rabbit-6485072_1280.jpg'
-				}, {
-					id: '10',
-					name: '李**',
-					phone: '181****5576',
-					img: 'https://cdn.pixabay.com/photo/2022/03/31/14/53/camp-7103189_1280.png'
-				}]
+				dataList: [],
+				searchlist:[],//搜索历史
 			};
 		},
-
+		onShow() {
+			this.getCountryList()
+			if(uni.getStorageSync('searchlist')){
+				this.searchlist = uni.getStorageSync('searchlist')
+			}
+		},
 		methods: {
+			//根据国家获取城市
+			getCountryList() {
+				uni.$u.http.get(`/api/area?is_domestic=0&pid=`).then((res) => {
+					this.dataList = res;
+				});
+			},
 			//点击列表回调事件
 			click(e) {
-				console.log('点击列表回调:', e)
+				const eventchannel = this.getOpenerEventChannel();
+				eventchannel.emit('getadd', e)
+				if(this.searchlist.includes(e)){
+					
+				}else{
+					this.searchlist.unshift(e)
+					uni.setStorageSync('searchlist',this.searchlist.slice(0,6))
+				}
+				uni.navigateBack()
 			}
 		}
 	}

+ 1 - 19
pageB/orderinfo.vue

@@ -1,28 +1,10 @@
 <template>
 	<view class="back">
-		<u-navbar :title="i18n.Vieworder" @leftClick="leftClick" :autoBack='false'>
+		<u-navbar :title="i18n.Vieworder" @leftClick="leftClick" :autoBack='false' :placeholder='true'>
 		</u-navbar>
 		<view class="top u-flex u-row-between">
 			<text class="success">{{i18n.successful}}</text>
 			<text class="sun">{{i18n.pickpackage}}</text>
-			<text v-if="orderinfo.status=='imperfect'" class="order" style="color:rgba(248, 50, 36, 1) ;">待完善</text>
-			<text v-if="orderinfo.status=='domestic_undelivered'" class="order"
-				style="color:rgba(248, 50, 36, 1) ;">国内未发货</text>
-			<text v-if="orderinfo.status=='domestic_delivered'" class="order"
-				style="color:rgba(248, 50, 36, 1) ;">国内已发货</text>
-			<text v-if="orderinfo.status=='domestic_received'" class="order"
-				style="color:rgba(248, 50, 36, 1) ;">国内已收货</text>
-			<text v-if="orderinfo.status=='unpaid'" class="order" style="color:rgba(248, 50, 36, 1) ;">待付款</text>
-			<text v-if="orderinfo.status=='overseas_undelivered'" class="order"
-				style="color:rgba(248, 50, 36, 1) ;">国际未发货</text>
-			<text v-if="orderinfo.status=='overseas_delivered'" class="order"
-				style="color:rgba(248, 50, 36, 1) ;">国际已发货</text>
-			<text v-if="orderinfo.status=='overseas_received'" class="order"
-				style="color:rgba(248, 50, 36, 1) ;">国际已收货</text>
-			<text v-if="orderinfo.status=='finished'" class="order" style="color:rgba(248, 50, 36, 1) ;">已完成</text>
-			<text v-if="orderinfo.status=='closed'" class="order" style="color:rgba(248, 50, 36, 1) ;">已关闭</text>
-			<text v-if="orderinfo.status=='refunding'" class="order" style="color:rgba(248, 50, 36, 1) ;">退款中</text>
-			<text v-if="orderinfo.status=='refunded'" class="order" style="color:rgba(248, 50, 36, 1) ;">已退款</text>
 		</view>
 		<view class="address">
 			<view class="" style="margin-top: 44rpx;">

+ 94 - 15
pageB/recipientinfo.vue

@@ -8,51 +8,51 @@
 			<view class="item u-flex " @click="tocitychange">
 				<text class="left">{{i18n.country}}</text>
 				<view class="right u-flex u-row-between" style="flex: 1;">
-					<input type="text" :placeholder="i18n.selection" />
+					<input type="text" :placeholder="i18n.selection" v-model="addname" />
 					<image src="../static/express/next1.png" style="width: 36rpx;height: 36rpx;" mode=""></image>
 				</view>
 			</view>
 			<view class="item u-flex ">
 				<text class="left">{{i18n.name}}</text>
 				<view class="right">
-					<input type="text" placeholder="请输入收件人姓名" />
+					<input type="text" :placeholder="i18n.name" v-model="name" />
 				</view>
 			</view>
 			<view class="item u-flex ">
 				<text class="left">{{i18n.phone}}</text>
 				<view class="right">
-					<input type="text" :placeholder="i18n.pleasePhoneNumber" />
+					<input type="text" :placeholder="i18n.pleasePhoneNumber" v-model="phone" />
 				</view>
 			</view>
 			<view class="item u-flex ">
 				<text class="left">{{i18n.postalCode}}</text>
 				<view class="right">
-					<input type="text" :placeholder="i18n.PleacePostalCode" />
+					<input type="text" :placeholder="i18n.PleacePostalCode" v-model="postalCode" />
 				</view>
 			</view>
 			<view class="item u-flex ">
 				<text class="left">{{i18n.city}}</text>
-				<view class="right u-flex u-row-between " style="flex: 1;">
-					<input type="text" :placeholder="i18n.selection" disabled="" />
+				<view class="right u-flex u-row-between " style="flex: 1;" @click="openCity">
+					<input type="text" :placeholder="i18n.selection" disabled="" v-model="cityname" />
 					<image src="../static/express/next1.png" style="width: 36rpx;height: 36rpx;" mode=""></image>
 				</view>
 			</view>
 			<view class="item u-flex ">
 				<text class="left">{{i18n.detailed}}</text>
 				<view class="right">
-					<input type="area" :placeholder="i18n.sect" />
+					<input type="area" :placeholder="i18n.sect" v-model="detailed" />
 				</view>
 			</view>
 			<view class="item u-flex ">
 				<text class="left">{{i18n.companyName}}</text>
 				<view class="right">
-					<input type="area" :placeholder="i18n.company" />
+					<input type="area" :placeholder="i18n.company" v-model="companyName" />
 				</view>
 			</view>
 			<view class="item u-flex ">
 				<text class="left">{{i18n.email}}</text>
 				<view class="right">
-					<input type="area" :placeholder="i18n.pleaseEmail" />
+					<input type="area" :placeholder="i18n.pleaseEmail" v-model="email" />
 				</view>
 			</view>
 			<!-- 默认地址 -->
@@ -60,7 +60,7 @@
 				<view class="u-flex">
 					<view class="">
 						<u-checkbox-group v-model="checkboxValue1" placement="row" @change="checkboxChange">
-							<u-checkbox shape='circle' :customStyle="{marginRight: '4px'}" :name="name">
+							<u-checkbox shape='circle' :customStyle="{marginRight: '4px'}" :name="active">
 							</u-checkbox>
 						</u-checkbox-group>
 					</view>
@@ -73,10 +73,13 @@
 		</view>
 		<view class="" style="height: 166rpx;"></view>
 		<view class="bottom">
-			<view class="btn">
+			<view class="btn" @click="submit">
 				{{i18n.enter}}
 			</view>
 		</view>
+		<!-- 选择省市区 -->
+		<u-picker :show="show" :columns="cityList" keyName="name" @confirm="countrycConfirm" @cancel="show = false"
+			:closeOnClickOverlay="true" @close="close"></u-picker>
 	</view>
 </template>
 
@@ -85,18 +88,94 @@
 		data() {
 			return {
 				checkboxValue1: [],
-				name: 1
+				active: 1,
+				addname: '',
+				addid: '',
+				show: false,
+				cityList: [],
+				cityid: '',
+				cityname: "",
+
+				name: "",
+				phone: "",
+				postalCode: "",
+				detailed: "",
+				email: "",
+				companyName: "",
+				is_default:0
 			};
 		},
 		methods: {
+			//确定
+			submit() {
+				const obj = {
+					mobile: this.phone,
+					name: this.name,
+					country_id: this.addid,
+					province_id: this.cityid,
+					address: this.detailed,
+					company_name: this.companyName,
+					email: this.email,
+					zip_code: this.postalCodee,
+					is_default:this.is_default
+				};
+				uni.$u.http.post(`/api/address`, obj).then((res) => {
+					console.log(res);
+					// this.$router.back();
+				});
+			},
+			//选择省市区
+			countrycConfirm(e) {
+				console.log(e);
+				this.cityid = e.value[0].id
+				this.cityname = e.value[0].name
+				this.show = false;
+			},
+			//打开选择城市的弹窗
+			openCity() {
+				//判断是否选择国家
+				if (this.addid) {
+					this.show = true
+					//判断选中的国家有没有城市数据
+					// if (this.cityList[0].length > 0) {
+					//   this.show = true;
+					// } else {
+					//   uni.$u.toast("该国家没有城市数据,请直接填写详细地址");
+					// }
+				} else {
+					uni.$u.toast("请先选择国家");
+				}
+			},
 			checkboxChange(n) {
 				console.log('change', n);
+				if(n.length>0){
+					this.is_default = 1
+				}else{
+					this.is_default = 0
+				}
 			},
-			tocitychange(){
+			//获取国家
+			tocitychange() {
+				var that = this
 				uni.navigateTo({
-					url:'/pageB/citychange'
+					url: '/pageB/citychange',
+					events: {
+						getadd(res) {
+							console.log(res.id);
+							that.addid = res.id
+							that.addname = res.name
+							that.getCityList()
+						}
+					}
 				})
-			}
+			},
+			//根据国家获取城市
+			getCityList() {
+				uni.$u.http.get(`/api/area/tree?pid=` + this.addid).then((res) => {
+					this.cityList = [res];
+					console.log(this.cityList);
+				});
+			},
 		},
 		computed: {
 			i18n() {

+ 723 - 799
pages/cart/cart.vue

@@ -1,824 +1,748 @@
 <template>
-  <!-- 购物车 -->
-  <view class="page">
-    <u-navbar :safeAreaInsetTop="true" :placeholder="true">
-      <view class="u-nav-slot" slot="left">
-        <view class="">
-          <text class="shopcart">{{ i18n.Shopping }}</text>
-          <text class="sum">({{ goodsNum }})</text>
-        </view>
-      </view>
-      <view class="u-nav-slot" slot="right">
-        <view class="u-flex">
-          <text @click="admin" v-if="success">{{ i18n.manage }}</text>
-          <text @click="admin" v-else>{{ i18n.complete }}</text>
-          <view class="" style="width: 200rpx"></view>
-        </view>
-      </view>
-    </u-navbar>
-    <u-checkbox-group
-      v-model="checkboxValue1"
-      placement="column"
-      @change="checkboxChange"
-    >
-      <view class="box" v-for="(item, idx) in goodsList" :key="idx">
-        <view class="item">
-          <view class="shopname u-flex">
-            <image
-              src="/static/mine/354.png"
-              class="circle"
-              mode="scaleToFill"
-              @click="shopSelectAll(item.goods)"
-              v-if="shop(item.goods)"
-            />
-            <image
-              src="/static/mine/353.png"
-              class="circle"
-              mode="scaleToFill"
-              @click="shopSelectAll(item.goods)"
-              v-else
-            />
-
-            <image
-              :src="item.image"
-              style="width: 28rpx; height: 28rpx"
-              mode=""
-            ></image>
-            <text>{{ item.merchant_name }}</text>
-            <image
-              src="/static/express/next1.png"
-              style="width: 32rpx; height: 32rpx"
-              mode=""
-            ></image>
-          </view>
-          <u-swipe-action>
-            <view
-              class="u-flex"
-              style="margin-top: 30rpx; width: 100%"
-              v-for="(chid, index) in item.goods"
-              :key="index"
-            >
-              <u-swipe-action-item
-                :options="options2"
-                @click="followOrdelete"
-                :autoClose="true"
-                :name="chid.cart.sku_item_id"
-                :disabled="chid.status == 'down'"
-              >
-                <!-- 				<view class="" style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;z-index: 100;background-color: rgba(255, 255, 255, 0.5);"></view> -->
-                <u-checkbox
-                  shape="circle"
-                  :customStyle="{ marginBottom: '8px' }"
-                  :name="chid.cart.sku_item_id"
-                  activeColor="#F83224"
-                  :disabled="chid.status == 'down'"
-                >
-                </u-checkbox>
-                <view
-                  class=""
-                  style="
+	<!-- 购物车 -->
+	<view class="page">
+		<u-navbar :safeAreaInsetTop="true" :placeholder="true">
+			<view class="u-nav-slot" slot="left">
+				<view class="">
+					<text class="shopcart">{{ i18n.Shopping }}</text>
+					<text class="sum">({{ goodsNum }})</text>
+				</view>
+			</view>
+			<view class="u-nav-slot" slot="right">
+				<view class="u-flex">
+					<text @click="admin" v-if="success">{{ i18n.manage }}</text>
+					<text @click="admin" v-else>{{ i18n.complete }}</text>
+					<view class="" style="width: 200rpx"></view>
+				</view>
+			</view>
+		</u-navbar>
+		<u-checkbox-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
+			<view class="box" v-for="(item, idx) in goodsList" :key="idx">
+				<view class="item">
+					<view class="shopname u-flex">
+						<image src="/static/mine/354.png" class="circle" mode="scaleToFill"
+							@click="shopSelectAll(item.goods)" v-if="shop(item.goods)" />
+						<image src="/static/mine/353.png" class="circle" mode="scaleToFill"
+							@click="shopSelectAll(item.goods)" v-else />
+
+						<image :src="item.image" style="width: 28rpx; height: 28rpx" mode=""></image>
+						<text>{{ item.merchant_name }}</text>
+						<image src="/static/express/next1.png" style="width: 32rpx; height: 32rpx" mode=""></image>
+					</view>
+					<u-swipe-action>
+						<view class="u-flex" style="margin-top: 30rpx; width: 100%" v-for="(chid, index) in item.goods"
+							:key="index">
+							<u-swipe-action-item :options="options2" @click="followOrdelete" :autoClose="true"
+								:name="chid.cart.sku_item_id" :disabled="chid.status == 'down'">
+								<!-- 				<view class="" style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;z-index: 100;background-color: rgba(255, 255, 255, 0.5);"></view> -->
+								<u-checkbox shape="circle" :customStyle="{ marginBottom: '8px' }"
+									:name="chid.cart.sku_item_id" activeColor="#F83224"
+									:disabled="chid.status == 'down'">
+								</u-checkbox>
+								<view class="" style="
                     position: relative;
                     width: 172rpx;
                     height: 172rpx;
                     border-radius: 16rpx;
-                  "
-                >
-                  <image
-                    :src="chid.image"
-                    style="width: 172rpx; height: 172rpx; border-radius: 20rpx"
-                    mode=""
-                  >
-                  </image>
-                  <view class="down" v-if="chid.status == 'down'"
-                    ><view class="sold"> 商品下架 </view></view
-                  >
-                </view>
-                <view
-                  class="good"
-                  style="flex: 1; margin-left: 10rpx; width: 65%"
-                >
-                  <view class="goodname">{{ chid.name_cn }}</view>
-                  <view class="goods" v-if="chid.sku_item.length > 0">{{
+                  ">
+									<image :src="chid.image" style="width: 172rpx; height: 172rpx; border-radius: 20rpx"
+										mode="">
+									</image>
+									<view class="down" v-if="chid.status == 'down'">
+										<view class="sold"> 商品下架 </view>
+									</view>
+								</view>
+								<view class="good" style="flex: 1; margin-left: 10rpx; width: 65%">
+									<view class="goodname">{{ chid.name_cn }}</view>
+									<view class="goods" v-if="chid.sku_item.length > 0">{{
                     chid.sku_item[0].item
                   }}</view>
-                  <view class="" style="margin-top: 21rpx">
-                    <view
-                      class="goodtab"
-                      v-for="itemLabel in chid.label_arr"
-                      :key="itemLabel.id"
-                      >{{ itemLabel.name_cn }}</view
-                    >
-                  </view>
-                  <view
-                    class="u-flex u-row-between"
-                    style="width: 100%; margin-top: 20rpx"
-                  >
-                    <view class="" v-if="chid.sku_item.length > 0">
-                      <text class="money">¥</text>
-                      <text class="money" style="font-size: 30rpx">{{
+									<view class="" style="margin-top: 21rpx">
+										<view class="goodtab" v-for="itemLabel in chid.label_arr" :key="itemLabel.id">
+											{{ itemLabel.name_cn }}</view>
+									</view>
+									<view class="u-flex u-row-between" style="width: 100%; margin-top: 20rpx">
+										<view class="" v-if="chid.sku_item.length > 0">
+											<text class="money">¥</text>
+											<text class="money" style="font-size: 30rpx">{{
                         chid.sku_item[0].price.split(".")[0]
                       }}</text>
-                      <text class="money"
-                        >.{{ chid.sku_item[0].price.split(".")[1] }}</text
-                      >
-                      <text class="weight"
-                        >{{ chid.sku_item[0].weight }}kg</text
-                      >
-                    </view>
-                    <view class="aaaaaa">
-                      <!-- <view class="delect" v-if='dele'>{{i18n.delete}}</view> -->
-                      <view
-                        class=""
-                        v-if="num == chid.cart.sku_item_id && success"
-                      >
-                        <!-- <u-number-box v-model="value" @change="valChange"></u-number-box> -->
-                        <u-number-box
-                          v-model="chid.cart.goods_num"
-                          @change="addOrReduce"
-                        >
-                          <view slot="minus" class="minus">
-                            <u-icon
-                              name="minus"
-                              color="#B5B5B5"
-                              size="12"
-                            ></u-icon>
-                          </view>
-                          <text
-                            slot="input"
-                            style="
+											<text class="money">.{{ chid.sku_item[0].price.split(".")[1] }}</text>
+											<text class="weight">{{ chid.sku_item[0].weight }}kg</text>
+										</view>
+										<view class="aaaaaa">
+											<!-- <view class="delect" v-if='dele'>{{i18n.delete}}</view> -->
+											<view class="" v-if="num == chid.cart.sku_item_id && success">
+												<!-- <u-number-box v-model="value" @change="valChange"></u-number-box> -->
+												<u-number-box v-model="chid.cart.goods_num" @change="addOrReduce">
+													<view slot="minus" class="minus">
+														<u-icon name="minus" color="#B5B5B5" size="12"></u-icon>
+													</view>
+													<text slot="input" style="
                               width: 50px;
                               text-align: center;
                               font-size: 20rpx;
-                            "
-                            class="input"
-                            >{{ chid.cart.goods_num }}</text
-                          >
-                          <view slot="plus" class="plus">
-                            <u-icon
-                              name="plus"
-                              color="#B5B5B5"
-                              size="12"
-                            ></u-icon>
-                          </view>
-                        </u-number-box>
-                      </view>
-                      <view
-                        class="num"
-                        v-if="
+                            " class="input">{{ chid.cart.goods_num }}</text>
+													<view slot="plus" class="plus">
+														<u-icon name="plus" color="#B5B5B5" size="12"></u-icon>
+													</view>
+												</u-number-box>
+											</view>
+											<view class="num" v-if="
                           num != chid.cart.sku_item_id &&
                           success &&
                           chid.status == 'normal'
-                        "
-                        @click="num = chid.cart.sku_item_id"
-                      >
-                        x{{ chid.cart.goods_num }}
-                      </view>
-                      <view
-                        v-if="chid.status == 'down'"
-                        class="del"
-                        @click="
+                        " @click="num = chid.cart.sku_item_id">
+												x{{ chid.cart.goods_num }}
+											</view>
+											<view v-if="chid.status == 'down'" class="del" @click="
                           followOrdelete({
                             index: 1,
                             name: chid.cart.sku_item_id,
                           })
-                        "
-                        >删除</view
-                      >
-                    </view>
-                    <view v-if="success == false" class="icon">
-                      <u-icon name="trash" color="#fff" size="20"></u-icon>
-                    </view>
-                  </view>
-                </view>
-              </u-swipe-action-item>
-            </view>
-          </u-swipe-action>
-        </view>
-      </view>
-    </u-checkbox-group>
-    <u-toast ref="uToast"></u-toast>
-    <view class="" style="height: 260rpx"></view>
-    <view class="back-top" @click="backTop">
-      <image
-        class="back-icon"
-        src="../../static/mine/355.png"
-        mode="scaleToFill"
-      />
-      <text class="back-text">顶部</text>
-    </view>
-    <kj-tabbar
-      ref="tabbar1"
-      :value1="3"
-      @allSelect="allSelect"
-      :goodsWeight="goodsWeight"
-      :goodsPrice="String(goodsPrice.toFixed(2))"
-      :goodsList="goodsList"
-      :checkboxValue1="checkboxValue1"
-    ></kj-tabbar>
-  </view>
+                        ">删除</view>
+										</view>
+										<view v-if="success == false" class="icon">
+											<u-icon name="trash" color="#fff" size="20"></u-icon>
+										</view>
+									</view>
+								</view>
+							</u-swipe-action-item>
+						</view>
+					</u-swipe-action>
+				</view>
+			</view>
+		</u-checkbox-group>
+		<u-toast ref="uToast"></u-toast>
+		<view class="" style="height: 260rpx"></view>
+		<view class="back-top" @click="backTop">
+			<image class="back-icon" src="../../static/mine/355.png" mode="scaleToFill" />
+			<text class="back-text">顶部</text>
+		</view>
+		<kj-tabbar ref="tabbar1" :value1="3" @allSelect="allSelect" :goodsWeight="goodsWeight"
+			:goodsPrice="String(goodsPrice.toFixed(2))" :goodsList="goodsList"
+			:checkboxValue1="checkboxValue1"></kj-tabbar>
+	</view>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      dele: true,
-      success: true,
-      shopitem: -1,
-      checkboxValue1: [], //商品数组
-      value: 0,
-      all: [], //全选数组
-      goodsList: [],
-      selectall: -1,
-      goodsNum: 0,
-      num: false,
-      goodsWeight: 0, //商品重量
-      goodsPrice: 0, //商品价格
-      options2: [
-        {
-          text: "移入关注",
-          style: {
-            backgroundColor: "#FFB115",
-          },
-        },
-        {
-          text: "删除",
-          style: {
-            backgroundColor: "#F83224",
-          },
-        },
-      ],
-      tabarheight: "",
-      removeProducts: 0, //已下架的商品数量
-    };
-  },
-  computed: {
-    i18n() {
-      return this.$t("index");
-    },
-  },
-  onLoad() {
-    const systemInfo = wx.getSystemInfoSync();
-    const tab =
-      systemInfo.screenHeight -
-      systemInfo.safeArea.bottom +
-      systemInfo.statusBarHeight;
-    this.tabarheight = tab;
-  },
-  methods: {
-    //返回顶部
-    backTop() {
-      uni.pageScrollTo({
-        scrollTop: 0, // 滚动到页面的目标位置  这个是滚动到顶部, 0
-        duration: 300, // 滚动动画的时长
-      });
-    },
-    //商品下架之后的商品字体颜色
-    getFontColor(status) {
-      if (status == "down") {
-        return "color:rgba(51, 51, 51, .6)";
-      }
-    },
-
-    //关注商品 or 删除商品
-    followOrdelete(e) {
-      //关注商品
-      if (e.index == 0) {
-        this.goodsList.map((item) => {
-          item.goods.map((items) => {
-            if (e.name == items.cart.sku_item_id) {
-              uni.$u.http
-                .post(`/api/interest/follow`, {
-                  interest_type: 0,
-                  interest_id: items.merchant_goods_id,
-                })
-                .then((res) => {
-                  console.log(res);
-                });
-            }
-          });
-        });
-      } else {
-        //删除商品
-        this.goodsList.map((item) => {
-          item.goods.map((items) => {
-            if (e.name == items.cart.sku_item_id) {
-              uni.$u.http
-                .delete(`/api/cart?ids=${items.cart.id}`)
-                .then((res) => {
-                  this.$refs.uToast.show({
-                    type: "default",
-                    title: "默认主题",
-                    message: "删除成功",
-                  });
-                  this.getShopCarList();
-                });
-            }
-          });
-        });
-      }
-    },
-
-    shop(value) {
-      let num = 0;
-      value.map((item) => {
-        if (this.checkboxValue1.indexOf(item.cart.sku_item_id) >= 0) {
-          num++;
-        }
-      });
-      return num;
-    },
-
-    //获取排除下架的商品之后的商品数量
-    getNormalGoodsNum(value) {
-      let num = 0;
-      value.map((item) => {
-        if (item.status != "down") {
-          num++;
-        }
-      });
-      return num;
-    },
-
-    //修改购物车商品数量
-    addOrReduce(n) {
-      uni.$u.http
-        .post(`/api/cart/num/${this.num}`, { goods_num: n.value, type: "" })
-        .then((res) => {
-          console.log(res);
-        });
-    },
-
-    //店铺商品全选
-    shopSelectAll(value) {
-      this.goodsPrice = 0;
-      this.goodsWeight = 0;
-      //先判断存放选中的数组有没有选中的数据
-      if (this.checkboxValue1.length == 0) {
-        //没有数据则直接将选中店铺中的商品存入数组
-        value.map((item) => {
-          //商品下架不得选中
-          if (item.status != "down") {
-            this.checkboxValue1.push(item.cart.sku_item_id);
-          }
-        });
-      } else {
-        if (
-          this.shop(value) > 0 &&
-          this.shop(value) == this.getNormalGoodsNum(value)
-        ) {
-          value.map((item) => {
-            //先判断选中的商品数组中该店铺商品是否已被选中,已被选中则取消选中
-            if (this.checkboxValue1.indexOf(item.cart.sku_item_id) >= 0) {
-              this.checkboxValue1.splice(
-                this.checkboxValue1.indexOf(item.cart.sku_item_id),
-                1
-              );
-            }
-          });
-        } else if (
-          (this.shop(value) > 0 &&
-            this.shop(value) != this.getNormalGoodsNum(value)) ||
-          this.shop(value) == 0
-        ) {
-          value.map((item) => {
-            //先判断选中的商品数组中该店铺商品是否已被选中,未被选中则推入选中状态,商品下架不得选中
-            if (
-              this.checkboxValue1.indexOf(item.cart.sku_item_id) == -1 &&
-              item.status != "down"
-            ) {
-              this.checkboxValue1.push(item.cart.sku_item_id);
-            }
-          });
-        }
-      }
-      if (this.checkboxValue1.length == this.goodsNum - this.removeProducts) {
-        this.$refs.tabbar1.cancelAll();
-      } else {
-        this.$refs.tabbar1.cancelAll("取消");
-      }
-
-      //将选中的商品价格相加
-      this.goodsList.map((item) => {
-        item.goods.map((items) => {
-          if (this.checkboxValue1.indexOf(items.cart.sku_item_id) > -1) {
-            this.goodsWeight += items.sku_item[0].weight * items.cart.goods_num;
-            this.goodsPrice +=
-              Number(items.sku_item[0].price) * items.cart.goods_num;
-          }
-        });
-      });
-      this.shop(value);
-    },
-    admin() {
-      this.success = !this.success;
-    },
-    valChange(e) {
-      console.log("当前值为: " + e.value);
-    },
-    //全选
-    checkAll(e) {
-      console.log("all", e);
-    },
-    //购物车单选
-    checkboxChange(n) {
-      //首先将价格和商品重量重置
-      this.goodsWeight = 0;
-      this.goodsPrice = 0;
-      this.checkboxValue1 = n;
-      this.goodsList.map((item) => {
-        item.goods.map((items) => {
-          if (n.indexOf(items.cart.sku_item_id) > -1) {
-            this.goodsWeight += items.sku_item[0].weight * items.cart.goods_num;
-            this.goodsPrice +=
-              Number(items.sku_item[0].price) * items.cart.goods_num;
-          }
-        });
-      });
-      //判断是否全部选中
-      if (
-        this.checkboxValue1.length == this.goodsNum - this.removeProducts &&
-        this.goodsNum != 0
-      ) {
-        this.$refs.tabbar1.cancelAll();
-      } else if (
-        this.checkboxValue1.length <
-        this.goodsNum - this.removeProducts
-      ) {
-        this.$refs.tabbar1.cancelAll("取消");
-      }
-    },
-    //购物车全选
-    allSelect() {
-      const all = this.$refs.tabbar1.cancelAll("全选");
-      if (
-        this.checkboxValue1.length == this.goodsNum - this.removeProducts &&
-        all.length == 0
-      ) {
-        return;
-      }
-      //判断是否已经全选,如已全选,则取消全选
-      if (this.checkboxValue1.length == this.goodsNum - this.removeProducts) {
-        this.checkboxValue1 = [];
-        this.goodsPrice = 0;
-        this.goodsWeight = 0;
-      } else {
-        this.goodsList.map((item) => {
-          item.goods.map((items) => {
-            //判断是否有商品已被选中
-            if (
-              this.checkboxValue1.indexOf(items.cart.sku_item_id) == -1 &&
-              items.status != "down"
-            ) {
-              this.checkboxValue1.push(items.cart.sku_item_id);
-              this.goodsWeight +=
-                items.sku_item[0].weight * items.cart.goods_num;
-              this.goodsPrice +=
-                Number(items.sku_item[0].price) * items.cart.goods_num;
-            }
-          });
-        });
-      }
-    },
-    //获取购物车数据
-    getShopCarList() {
-      uni.$u.http.get(`/api/cart`).then((res) => {
-        this.goodsList = res.data;
-        //循环店铺,获取购物车商品数量
-        this.goodsList.map((item) => {
-          this.goodsNum += item.goods.length;
-          item.goods.map((items) => {
-            if (items.status == "down") {
-              this.removeProducts++;
-            }
-          });
-        });
-      });
-    },
-  },
-  mounted() {
-    this.getShopCarList();
-  },
-};
+	export default {
+		data() {
+			return {
+				dele: true,
+				success: true,
+				shopitem: -1,
+				checkboxValue1: [], //商品数组
+				value: 0,
+				all: [], //全选数组
+				goodsList: [],
+				selectall: -1,
+				goodsNum: 0,
+				num: false,
+				goodsWeight: 0, //商品重量
+				goodsPrice: 0, //商品价格
+				options2: [{
+						text: "移入关注",
+						style: {
+							backgroundColor: "#FFB115",
+						},
+					},
+					{
+						text: "删除",
+						style: {
+							backgroundColor: "#F83224",
+						},
+					},
+				],
+				tabarheight: "",
+				removeProducts: 0, //已下架的商品数量
+			};
+		},
+		computed: {
+			i18n() {
+				return this.$t("index");
+			},
+		},
+		onLoad() {
+			const systemInfo = wx.getSystemInfoSync();
+			const tab =
+				systemInfo.screenHeight -
+				systemInfo.safeArea.bottom +
+				systemInfo.statusBarHeight;
+			this.tabarheight = tab;
+
+		},
+		onShow() {
+			this.getShopCarList()
+		},
+		methods: {
+			//返回顶部
+			backTop() {
+				uni.pageScrollTo({
+					scrollTop: 0, // 滚动到页面的目标位置  这个是滚动到顶部, 0
+					duration: 300, // 滚动动画的时长
+				});
+			},
+			//商品下架之后的商品字体颜色
+			getFontColor(status) {
+				if (status == "down") {
+					return "color:rgba(51, 51, 51, .6)";
+				}
+			},
+
+			//关注商品 or 删除商品
+			followOrdelete(e) {
+				//关注商品
+				if (e.index == 0) {
+					this.goodsList.map((item) => {
+						item.goods.map((items) => {
+							if (e.name == items.cart.sku_item_id) {
+								uni.$u.http
+									.post(`/api/interest/follow`, {
+										interest_type: 0,
+										interest_id: items.merchant_goods_id,
+									})
+									.then((res) => {
+										console.log(res);
+									});
+							}
+						});
+					});
+				} else {
+					//删除商品
+					this.goodsList.map((item) => {
+						item.goods.map((items) => {
+							if (e.name == items.cart.sku_item_id) {
+								uni.$u.http
+									.delete(`/api/cart?ids=${items.cart.id}`)
+									.then((res) => {
+										this.$refs.uToast.show({
+											type: "default",
+											title: "默认主题",
+											message: "删除成功",
+										});
+										this.getShopCarList();
+									});
+							}
+						});
+					});
+				}
+			},
+
+			shop(value) {
+				let num = 0;
+				value.map((item) => {
+					if (this.checkboxValue1.indexOf(item.cart.sku_item_id) >= 0) {
+						num++;
+					}
+				});
+				return num;
+			},
+
+			//获取排除下架的商品之后的商品数量
+			getNormalGoodsNum(value) {
+				let num = 0;
+				value.map((item) => {
+					if (item.status != "down") {
+						num++;
+					}
+				});
+				return num;
+			},
+
+			//修改购物车商品数量
+			addOrReduce(n) {
+				uni.$u.http
+					.post(`/api/cart/num/${this.num}`, {
+						goods_num: n.value,
+						type: ""
+					})
+					.then((res) => {
+						console.log(res);
+					});
+			},
+
+			//店铺商品全选
+			shopSelectAll(value) {
+				this.goodsPrice = 0;
+				this.goodsWeight = 0;
+				//先判断存放选中的数组有没有选中的数据
+				if (this.checkboxValue1.length == 0) {
+					//没有数据则直接将选中店铺中的商品存入数组
+					value.map((item) => {
+						//商品下架不得选中
+						if (item.status != "down") {
+							this.checkboxValue1.push(item.cart.sku_item_id);
+						}
+					});
+				} else {
+					if (
+						this.shop(value) > 0 &&
+						this.shop(value) == this.getNormalGoodsNum(value)
+					) {
+						value.map((item) => {
+							//先判断选中的商品数组中该店铺商品是否已被选中,已被选中则取消选中
+							if (this.checkboxValue1.indexOf(item.cart.sku_item_id) >= 0) {
+								this.checkboxValue1.splice(
+									this.checkboxValue1.indexOf(item.cart.sku_item_id),
+									1
+								);
+							}
+						});
+					} else if (
+						(this.shop(value) > 0 &&
+							this.shop(value) != this.getNormalGoodsNum(value)) ||
+						this.shop(value) == 0
+					) {
+						value.map((item) => {
+							//先判断选中的商品数组中该店铺商品是否已被选中,未被选中则推入选中状态,商品下架不得选中
+							if (
+								this.checkboxValue1.indexOf(item.cart.sku_item_id) == -1 &&
+								item.status != "down"
+							) {
+								this.checkboxValue1.push(item.cart.sku_item_id);
+							}
+						});
+					}
+				}
+				if (this.checkboxValue1.length == this.goodsNum - this.removeProducts) {
+					this.$refs.tabbar1.cancelAll();
+				} else {
+					this.$refs.tabbar1.cancelAll("取消");
+				}
+
+				//将选中的商品价格相加
+				this.goodsList.map((item) => {
+					item.goods.map((items) => {
+						if (this.checkboxValue1.indexOf(items.cart.sku_item_id) > -1) {
+							this.goodsWeight += items.sku_item[0].weight * items.cart.goods_num;
+							this.goodsPrice +=
+								Number(items.sku_item[0].price) * items.cart.goods_num;
+						}
+					});
+				});
+				this.shop(value);
+			},
+			admin() {
+				this.success = !this.success;
+			},
+			valChange(e) {
+				console.log("当前值为: " + e.value);
+			},
+			//全选
+			checkAll(e) {
+				console.log("all", e);
+			},
+			//购物车单选
+			checkboxChange(n) {
+				console.log(n);
+				//首先将价格和商品重量重置
+				this.goodsWeight = 0;
+				this.goodsPrice = 0;
+				this.checkboxValue1 = n;
+				this.goodsList.map((item) => {
+					item.goods.map((items) => {
+						if (n.indexOf(items.cart.sku_item_id) > -1) {
+							this.goodsWeight += items.sku_item[0].weight * items.cart.goods_num;
+							this.goodsPrice +=
+								Number(items.sku_item[0].price) * items.cart.goods_num;
+							
+						}
+					});
+				});
+				//判断是否全部选中
+				if (
+					this.checkboxValue1.length == this.goodsNum - this.removeProducts &&
+					this.goodsNum != 0
+				) {
+					this.$refs.tabbar1.cancelAll();
+				} else if (
+					this.checkboxValue1.length <
+					this.goodsNum - this.removeProducts
+				) {
+					this.$refs.tabbar1.cancelAll("取消");
+				}
+			},
+			//购物车全选
+			allSelect() {
+				const all = this.$refs.tabbar1.cancelAll("全选");
+				if (
+					this.checkboxValue1.length == this.goodsNum - this.removeProducts &&
+					all.length == 0
+				) {
+					return;
+				}
+				//判断是否已经全选,如已全选,则取消全选
+				if (this.checkboxValue1.length == this.goodsNum - this.removeProducts) {
+					this.checkboxValue1 = [];
+					this.goodsPrice = 0;
+					this.goodsWeight = 0;
+				} else {
+					this.goodsList.map((item) => {
+						item.goods.map((items) => {
+							//判断是否有商品已被选中
+							if (
+								this.checkboxValue1.indexOf(items.cart.sku_item_id) == -1 &&
+								items.status != "down"
+							) {
+								this.checkboxValue1.push(items.cart.sku_item_id);
+								this.goodsWeight +=
+									items.sku_item[0].weight * items.cart.goods_num;
+								this.goodsPrice +=
+									Number(items.sku_item[0].price) * items.cart.goods_num;
+							}
+						});
+					});
+				}
+			},
+			//获取购物车数据
+			getShopCarList() {
+				uni.$u.http.get(`/api/cart`).then((res) => {
+					this.goodsList = res.data;
+					//循环店铺,获取购物车商品数量
+					this.goodsList.map((item) => {
+						this.goodsNum += item.goods.length;
+						item.goods.map((items) => {
+							if (items.status == "down") {
+								this.removeProducts++;
+							}
+						});
+					});
+				});
+			},
+		},
+		// mounted() {
+		//   this.getShopCarList();
+		// },
+	};
 </script>
 
 <style lang="scss" scoped>
-.page {
-  position: relative;
-  .back-top {
-    position: fixed;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    width: 88rpx;
-    height: 88rpx;
-    background-color: #fff;
-    border-radius: 50%;
-    bottom: 280rpx;
-    right: 20rpx;
-    z-index: 1000;
-    .back-icon {
-      width: 32rpx;
-      height: 30rpx;
-    }
-    .back-text {
-      font-size: 20rpx;
-      color: #555;
-    }
-  }
-}
-.sold {
-  width: 108rpx;
-  height: 36rpx;
-  background: rgba(0, 0, 0, 0.4);
-  border-radius: 18rpx;
-  // padding: 0 14rpx;
-  text-align: center;
-  box-sizing: border-box;
-  line-height: 36rpx;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 20rpx;
-  color: #ffffff;
-  font-style: normal;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  margin-top: -18rpx;
-  margin-left: -54rpx;
-}
-
-.delect {
-  // width: 68rpx;
-  height: 44rpx;
-  line-height: 44rpx;
-  border-radius: 22rpx;
-  border: 1rpx solid #ff1515;
-  padding: 0 14rpx;
-  box-sizing: border-box;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 20rpx;
-  color: #ff1515;
-  text-align: center;
-  font-style: normal;
-}
-
-.allweight {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 22rpx;
-  color: #333333;
-  line-height: 32rpx;
-  text-align: left;
-  font-style: normal;
-}
-
-.sum {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 22rpx;
-  color: #333333;
-  line-height: 32rpx;
-  text-align: left;
-  font-style: normal;
-}
-
-.summon {
-  font-family: JDZhengHT, JDZhengHT;
-  font-weight: 400;
-  font-size: 24rpx;
-  color: #ff1515;
-  line-height: 30rpx;
-  text-align: left;
-  font-style: normal;
-}
-
-.settle {
-  width: 176rpx;
-  height: 68rpx;
-  background: #f83224;
-  border-radius: 38rpx;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 28rpx;
-  color: #ffffff;
-  line-height: 68rpx;
-  text-align: center;
-  font-style: normal;
-  margin-left: 20rpx;
-}
-
-.icon {
-  width: 40rpx;
-  height: 40rpx;
-  background: #f83224;
-  border-radius: 12rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.dle {
-  width: 136rpx;
-  height: 60rpx;
-  border-radius: 38rpx;
-  border: 1rpx solid #979797;
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 400;
-  font-size: 26rpx;
-  color: #333333;
-  line-height: 60rpx;
-  text-align: center;
-  font-style: normal;
-}
-
-::v-deep .u-swipe-action-item__content {
-  flex-direction: row !important;
-}
-::v-deep .u-swipe-action-item__right__button__wrapper {
-  width: 32px;
-  word-wrap: break-word;
-  font-size: 20rpx !important;
-}
-::v-deep .u-swipe-action-item__right__button__wrapper__text {
-  word-wrap: break-word;
-}
-
-::v-deep .u-swipe-action-item {
-  width: 100% !important;
-}
-
-::v-deep .u-swipe-action-item__right {
-  top: 2rpx !important;
-  right: 2rpx !important;
-  bottom: 2rpx !important;
-}
-
-.bottom {
-  width: 750rpx;
-  height: 100rpx;
-  background: #ffffff;
-  padding: 0 24rpx;
-  box-sizing: border-box;
-}
-
-.num {
-  width: 40rpx;
-  height: 40rpx;
-  border-radius: 20rpx;
-  border: 1rpx solid rgba(151, 151, 151, 0.4);
-  font-family: HarmonyOS_Sans;
-  font-size: 20rpx;
-  color: #222222;
-  line-height: 40rpx;
-  text-align: center;
-  font-style: normal;
-}
-.del {
-  width: 68rpx;
-  height: 44rpx;
-  text-align: center;
-  line-height: 44rpx;
-  border: 2rpx solid #f83224;
-  color: #f83224;
-  font-size: 20rpx;
-  border-radius: 22rpx;
-}
-
-.box {
-  padding: 0rpx 24rpx 20rpx;
-  margin-top: 20rpx;
-  box-sizing: border-box;
-
-  .item {
-    padding: 36rpx 20rpx;
-    box-sizing: border-box;
-    width: 702rpx;
-    // height: 556rpx;
-    background: #ffffff;
-    border-radius: 16rpx;
-
-    .money {
-      font-family: HarmonyOS_Sans_Medium;
-      font-size: 20rpx;
-      color: #ff1515;
-      line-height: 26rpx;
-      text-align: left;
-      font-style: normal;
-    }
-
-    .weight {
-      font-family: SFPro, SFPro;
-      font-weight: 400;
-      font-size: 20rpx;
-      color: #333333;
-      line-height: 24rpx;
-      text-align: left;
-      font-style: normal;
-      margin-left: 12rpx;
-    }
-
-    .goodtab {
-      // width: 96rpx;
-      height: 32rpx;
-      border-radius: 4rpx;
-      border: 1rpx solid #ff1515;
-      padding: 2rpx 8rpx;
-      box-sizing: border-box;
-      text-align: center;
-      line-height: 32rpx;
-      display: inline;
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 20rpx;
-      color: #ff1515;
-      line-height: 28rpx;
-      text-align: left;
-      font-style: normal;
-      margin-right: 6rpx;
-    }
-
-    .goods {
-      // width: 284rpx;
-      height: 40rpx;
-      background: #f4f4f4;
-      border-radius: 8rpx;
-      display: inline;
-      text-align: center;
-      line-height: 40rpx;
-      margin-top: 20rpx;
-      padding: 6rpx 12rpx;
-      box-sizing: border-box;
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 400;
-      font-size: 20rpx;
-      color: #555555;
-      line-height: 28rpx;
-      text-align: left;
-      font-style: normal;
-    }
-
-    .goodname {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 500;
-      font-size: 28rpx;
-      color: #333333;
-      line-height: 40rpx;
-      text-align: left;
-      font-style: normal;
-      overflow: hidden;
-      text-overflow: ellipsis;
-	  word-break: break-all;
-      white-space: nowrap;
-      width: 100%;
-    }
-
-    .shopname {
-      font-family: PingFangSC, PingFang SC;
-      font-weight: 500;
-      font-size: 26rpx;
-      color: #333333;
-      line-height: 36rpx;
-      text-align: left;
-      font-style: normal;
-      .circle {
-        width: 32rpx;
-        height: 32rpx;
-        margin-right: 10rpx;
-      }
-    }
-  }
-}
-
-.shopcart {
-  font-family: PingFangSC, PingFang SC;
-  font-weight: 500;
-  font-size: 36rpx;
-  color: #222222;
-  line-height: 50rpx;
-  text-align: right;
-  font-style: normal;
-}
-
-.sum {
-  font-family: HarmonyOS_Sans;
-  font-size: 22rpx;
-  color: #333333;
-  line-height: 32rpx;
-  text-align: left;
-  font-style: normal;
-}
-.down {
-  position: absolute;
-  top: 0;
-  left: 0;
-  background-color: #c7c7c7;
-  opacity: 0.7;
-  width: 100%;
-  height: 100%;
-  z-index: 10000;
-  border-radius: 20rpx;
-}
-</style>
+	.page {
+		position: relative;
+
+		.back-top {
+			position: fixed;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			width: 88rpx;
+			height: 88rpx;
+			background-color: #fff;
+			border-radius: 50%;
+			bottom: 280rpx;
+			right: 20rpx;
+			z-index: 1000;
+
+			.back-icon {
+				width: 32rpx;
+				height: 30rpx;
+			}
+
+			.back-text {
+				font-size: 20rpx;
+				color: #555;
+			}
+		}
+	}
+
+	.sold {
+		width: 108rpx;
+		height: 36rpx;
+		background: rgba(0, 0, 0, 0.4);
+		border-radius: 18rpx;
+		// padding: 0 14rpx;
+		text-align: center;
+		box-sizing: border-box;
+		line-height: 36rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #ffffff;
+		font-style: normal;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		margin-top: -18rpx;
+		margin-left: -54rpx;
+	}
+
+	.delect {
+		// width: 68rpx;
+		height: 44rpx;
+		line-height: 44rpx;
+		border-radius: 22rpx;
+		border: 1rpx solid #ff1515;
+		padding: 0 14rpx;
+		box-sizing: border-box;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 20rpx;
+		color: #ff1515;
+		text-align: center;
+		font-style: normal;
+	}
+
+	.allweight {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #333333;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.sum {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #333333;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.summon {
+		font-family: JDZhengHT, JDZhengHT;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #ff1515;
+		line-height: 30rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.settle {
+		width: 176rpx;
+		height: 68rpx;
+		background: #f83224;
+		border-radius: 38rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #ffffff;
+		line-height: 68rpx;
+		text-align: center;
+		font-style: normal;
+		margin-left: 20rpx;
+	}
+
+	.icon {
+		width: 40rpx;
+		height: 40rpx;
+		background: #f83224;
+		border-radius: 12rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.dle {
+		width: 136rpx;
+		height: 60rpx;
+		border-radius: 38rpx;
+		border: 1rpx solid #979797;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #333333;
+		line-height: 60rpx;
+		text-align: center;
+		font-style: normal;
+	}
+
+	::v-deep .u-swipe-action-item__content {
+		flex-direction: row !important;
+	}
+
+	::v-deep .u-swipe-action-item__right__button__wrapper {
+		width: 32px;
+		word-wrap: break-word;
+		font-size: 20rpx !important;
+	}
+
+	::v-deep .u-swipe-action-item__right__button__wrapper__text {
+		word-wrap: break-word;
+	}
+
+	::v-deep .u-swipe-action-item {
+		width: 100% !important;
+	}
+
+	::v-deep .u-swipe-action-item__right {
+		top: 2rpx !important;
+		right: 2rpx !important;
+		bottom: 2rpx !important;
+	}
+
+	.bottom {
+		width: 750rpx;
+		height: 100rpx;
+		background: #ffffff;
+		padding: 0 24rpx;
+		box-sizing: border-box;
+	}
+
+	.num {
+		width: 40rpx;
+		height: 40rpx;
+		border-radius: 20rpx;
+		border: 1rpx solid rgba(151, 151, 151, 0.4);
+		font-family: HarmonyOS_Sans;
+		font-size: 20rpx;
+		color: #222222;
+		line-height: 40rpx;
+		text-align: center;
+		font-style: normal;
+	}
+
+	.del {
+		width: 68rpx;
+		height: 44rpx;
+		text-align: center;
+		line-height: 44rpx;
+		border: 2rpx solid #f83224;
+		color: #f83224;
+		font-size: 20rpx;
+		border-radius: 22rpx;
+	}
+
+	.box {
+		padding: 0rpx 24rpx 20rpx;
+		margin-top: 20rpx;
+		box-sizing: border-box;
+
+		.item {
+			padding: 36rpx 20rpx;
+			box-sizing: border-box;
+			width: 702rpx;
+			// height: 556rpx;
+			background: #ffffff;
+			border-radius: 16rpx;
+
+			.money {
+				font-family: HarmonyOS_Sans_Medium;
+				font-size: 20rpx;
+				color: #ff1515;
+				line-height: 26rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.weight {
+				font-family: SFPro, SFPro;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #333333;
+				line-height: 24rpx;
+				text-align: left;
+				font-style: normal;
+				margin-left: 12rpx;
+			}
+
+			.goodtab {
+				// width: 96rpx;
+				height: 32rpx;
+				border-radius: 4rpx;
+				border: 1rpx solid #ff1515;
+				padding: 2rpx 8rpx;
+				box-sizing: border-box;
+				text-align: center;
+				line-height: 32rpx;
+				display: inline;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #ff1515;
+				line-height: 28rpx;
+				text-align: left;
+				font-style: normal;
+				margin-right: 6rpx;
+			}
+
+			.goods {
+				// width: 284rpx;
+				height: 40rpx;
+				background: #f4f4f4;
+				border-radius: 8rpx;
+				display: inline;
+				text-align: center;
+				line-height: 40rpx;
+				margin-top: 20rpx;
+				padding: 6rpx 12rpx;
+				box-sizing: border-box;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #555555;
+				line-height: 28rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.goodname {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #333333;
+				line-height: 40rpx;
+				text-align: left;
+				font-style: normal;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				word-break: break-all;
+				white-space: nowrap;
+				width: 100%;
+			}
+
+			.shopname {
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 500;
+				font-size: 26rpx;
+				color: #333333;
+				line-height: 36rpx;
+				text-align: left;
+				font-style: normal;
+
+				.circle {
+					width: 32rpx;
+					height: 32rpx;
+					margin-right: 10rpx;
+				}
+			}
+		}
+	}
+
+	.shopcart {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 36rpx;
+		color: #222222;
+		line-height: 50rpx;
+		text-align: right;
+		font-style: normal;
+	}
+
+	.sum {
+		font-family: HarmonyOS_Sans;
+		font-size: 22rpx;
+		color: #333333;
+		line-height: 32rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	.down {
+		position: absolute;
+		top: 0;
+		left: 0;
+		background-color: #c7c7c7;
+		opacity: 0.7;
+		width: 100%;
+		height: 100%;
+		z-index: 10000;
+		border-radius: 20rpx;
+	}
+</style>

+ 19 - 10
uni_modules/liu-indexed-list/components/liu-indexed-list/liu-indexed-list.vue

@@ -4,25 +4,26 @@
 			:scroll-into-view="scrollIntoView">
 			<view class="liu-search" id="TOP">
 				<image class="liu-search-img" src="../../static/search.png"></image>
-				<input class="liu-input" @input="search" v-model="searchStr" placeholder="请输入国家或地区中文名称" maxlength="50"
+				<input class="liu-input" @input="search" v-model="searchStr" placeholder="请输入国家" maxlength="50"
 					placeholder-class="liu-placeholder" />
 			</view>
 			<view class="" style="padding: 24rpx ;background-color: #fff;">
 				<view class="use">最近使用</view>
-				<view class="" style="margin-top: 24rpx;">
-					<view class="item" style="display: inline; " @click="tosearch">
-						马拉西亚
+				<view class="" style="margin-top: 24rpx;column-gap: 10rpx;display: flex;flex-wrap: wrap;">
+					<view class="item" style=" " @click="tosearch(item)"
+						v-for="(item,idx) in searchlist" :key="idx">
+						{{item.name}}
 					</view>
 				</view>
 			</view>
 			<view class="left-list" v-for="(item,index) of scrollLeftObj" :key="index" :id="index!='#'?index:'BOTTOM'">
 				<view class="left-item-title" v-if="item && item.length">{{index}}</view>
 				<view class="left-item-card" v-for="(mess,inx) in item" @click.stop="chooseItem(mess)">
-					<image :style="'border-radius:'+radius" class="left-item-card-img img-info" :src="mess[imgKey]"
+					<!-- 				<image :style="'border-radius:'+radius" class="left-item-card-img img-info" :src="mess[imgKey]"
 						v-if="mess[imgKey]" @click.stop="preview(mess[imgKey])"></image>
 					<view :style="'border-radius:'+radius" class="left-item-card-img" v-else>
 						{{mess[nameKey] && mess[nameKey].slice(0,1) || ''}}
-					</view>
+					</view> -->
 					<view class="left-item-card-info"
 						:style="inx<item.length-1?'border-bottom: solid #F4F4F4 1rpx;':''">
 						<view class="left-item-card-name">{{mess[nameKey] || ''}}</view>
@@ -91,9 +92,15 @@
 				scrollLeftObj: {},
 				oldObj: {},
 				scrollRightList: [],
-				hasData: true
+				hasData: true,
+				searchlist:[]
 			};
 		},
+		mounted() {
+			if (uni.getStorageSync('searchlist')) {
+				this.searchlist = uni.getStorageSync('searchlist')
+			}
+		},
 		watch: {
 			dataList: {
 				immediate: true,
@@ -104,8 +111,8 @@
 			},
 		},
 		methods: {
-			tosearch(){
-				this.searchStr = 111
+			tosearch(item) {
+				this.searchStr = item.name
 				this.search()
 			},
 			search() {
@@ -212,9 +219,11 @@
 		font-weight: 400;
 		font-size: 28rpx;
 		color: #222222;
-		line-height: 60rpx;
+		// line-height: 60rpx;
 		text-align: center;
 		font-style: normal;
+		margin-bottom: 10rpx;
+		box-sizing: border-box;
 	}
 
 	.liu-list {

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


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


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/comment.js


+ 1 - 1
unpackage/dist/build/mp-weixin/pageA/comment.wxml

@@ -1 +1 @@
-<view class="back data-v-1b3911bd"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view class="box data-v-1b3911bd"><view style="display:flex;justify-content:space-between;" class="data-v-1b3911bd"><view class="u-flex data-v-1b3911bd"><image style="width:68rpx;height:68rpx;border:radius 34rpx;" src="{{item.$orig.member.avatar}}" mode class="data-v-1b3911bd"></image><view class="data-v-1b3911bd"><text class="name data-v-1b3911bd">{{item.g0+'***'+item.g1}}</text><uni-rate bind:input="__e" vue-id="{{'cf029f7c-1-'+idx}}" network="{{true}}" allow-half="{{true}}" readonly="{{true}}" color="rgba(247, 181, 0, 1)" size="{{8}}" value="{{rate}}" data-event-opts="{{[['^input',[['__set_model',['','rate','$event',[]]]]]]}}" class="data-v-1b3911bd" bind:__l="__l"></uni-rate></view></view><text class="day data-v-1b3911bd">{{item.m0}}</text></view><view class="day data-v-1b3911bd" style="margin-top:24rpx;">{{item.$orig.sku_item.item}}</view><view class="content data-v-1b3911bd" style="margin-top:20rpx;">{{item.$orig.content}}</view><view class="u-flex u-row-between data-v-1b3911bd" style="margin-top:22rpx;flex-wrap:wrap;"><block wx:for="{{item.l0}}" wx:for-item="child" wx:for-index="index" wx:key="index"><image style="margin-bottom:20rpx;width:326rpx;height:326rpx;border-radius:12rpx;background:#D8D8D8;" src="{{child}}" mode class="data-v-1b3911bd"></image></block></view></view></block></view>
+<view class="back data-v-338b9728"><block wx:if="{{$root.g0>0}}"><view class="data-v-338b9728"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view class="box data-v-338b9728"><view style="display:flex;justify-content:space-between;" class="data-v-338b9728"><view class="u-flex data-v-338b9728"><image style="width:68rpx;height:68rpx;border:radius 34rpx;" src="{{item.$orig.member.avatar}}" mode class="data-v-338b9728"></image><view class="data-v-338b9728"><text class="name data-v-338b9728">{{item.g1+'***'+item.g2}}</text><uni-rate bind:input="__e" vue-id="{{'cf029f7c-1-'+idx}}" network="{{true}}" allow-half="{{true}}" readonly="{{true}}" color="rgba(247, 181, 0, 1)" size="{{8}}" value="{{rate}}" data-event-opts="{{[['^input',[['__set_model',['','rate','$event',[]]]]]]}}" class="data-v-338b9728" bind:__l="__l"></uni-rate></view></view><text class="day data-v-338b9728">{{item.m0}}</text></view><view class="day data-v-338b9728" style="margin-top:24rpx;">{{item.$orig.sku_item.item}}</view><view class="content data-v-338b9728" style="margin-top:20rpx;">{{item.$orig.content}}</view><block wx:if="{{item.$orig.image}}"><view class="u-flex u-row-between data-v-338b9728" style="margin-top:22rpx;flex-wrap:wrap;"><block wx:for="{{item.l0}}" wx:for-item="child" wx:for-index="index" wx:key="index"><image style="margin-bottom:20rpx;width:326rpx;height:326rpx;border-radius:12rpx;background:#D8D8D8;" src="{{child}}" mode class="data-v-338b9728"></image></block></view></block></view></block></view></block><view style="height:400rpx;text-align:center;line-height:400rpx;" class="data-v-338b9728">暂无数据</view></view>

+ 1 - 1
unpackage/dist/build/mp-weixin/pageA/comment.wxss

@@ -1 +1 @@
-.back.data-v-1b3911bd{padding:20rpx;box-sizing:border-box}.back .box.data-v-1b3911bd{background:#fff;border-radius:16rpx;padding:24rpx 20rpx;box-sizing:border-box;margin-bottom:20rpx}.back .day.data-v-1b3911bd{font-family:SFPro;font-weight:400;font-size:20rpx;color:#9e9e9e;line-height:24rpx;text-align:justify;font-style:normal}.back .content.data-v-1b3911bd{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#444;line-height:36rpx;text-align:justify;font-style:normal}.back .name.data-v-1b3911bd{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:22rpx;color:#444;line-height:32rpx;text-align:left;font-style:normal;margin-bottom:34rpx}
+.back.data-v-338b9728{padding:20rpx;box-sizing:border-box}.back .box.data-v-338b9728{background:#fff;border-radius:16rpx;padding:24rpx 20rpx;box-sizing:border-box;margin-bottom:20rpx}.back .day.data-v-338b9728{font-family:SFPro;font-weight:400;font-size:20rpx;color:#9e9e9e;line-height:24rpx;text-align:justify;font-style:normal}.back .content.data-v-338b9728{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#444;line-height:36rpx;text-align:justify;font-style:normal}.back .name.data-v-338b9728{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:22rpx;color:#444;line-height:32rpx;text-align:left;font-style:normal;margin-bottom:34rpx}

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/counter.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/counter.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/logisticsinfo.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/order.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/order.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/payorder.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/productdetails.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/productdetails.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageA/productdetails.wxss


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/ParcelExpress.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/ParcelExpress.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/ParcelExpress.wxss


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/account.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/account.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/citychange.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/delivery.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/delivery.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/end.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/end.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/goods.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/goods.wxml


+ 5 - 1
unpackage/dist/build/mp-weixin/pageB/orderinfo.js

@@ -1 +1,5 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/orderinfo"],{"25fa":function(n,e,t){"use strict";t.r(e);var o=t("ec86"),r=t("a9d5");for(var i in r)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(i);t("84ee");var u=t("828b"),a=Object(u["a"])(r["default"],o["b"],o["c"],!1,null,"fa7c2f78",null,!1,o["a"],void 0);e["default"]=a.exports},"84ee":function(n,e,t){"use strict";var o=t("b1b6"),r=t.n(o);r.a},"8b5a":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{orderinfo:{}}},onLoad:function(n){this.orderinfo=JSON.parse(decodeURIComponent(n.orderinfo)),console.log(this.orderinfo),this.$u.toast(this.i18n.successful+this.i18n.MyOrder)},computed:{i18n:function(){return this.$t("index")}},methods:{leftClick:function(){n.switchTab({url:"/pages/mine/mine"})}}};e.default=t}).call(this,t("df3c")["default"])},"8d8c":function(n,e,t){"use strict";(function(n,e){var o=t("47a9");t("abeb");o(t("3240"));var r=o(t("25fa"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(r.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])},a9d5:function(n,e,t){"use strict";t.r(e);var o=t("8b5a"),r=t.n(o);for(var i in o)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(i);e["default"]=r.a},b1b6:function(n,e,t){},ec86:function(n,e,t){"use strict";t.d(e,"b",(function(){return r})),t.d(e,"c",(function(){return i})),t.d(e,"a",(function(){return o}));var o={uNavbar:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-navbar/u-navbar")]).then(t.bind(null,"f3ae"))}},r=function(){var n=this.$createElement;this._self._c},i=[]}},[["8d8c","common/runtime","common/vendor"]]]);
+<<<<<<< HEAD
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/orderinfo"],{"25fa":function(n,e,t){"use strict";t.r(e);var o=t("ec86"),r=t("a9d5");for(var i in r)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(i);t("84ee");var u=t("828b"),a=Object(u["a"])(r["default"],o["b"],o["c"],!1,null,"fa7c2f78",null,!1,o["a"],void 0);e["default"]=a.exports},"84ee":function(n,e,t){"use strict";var o=t("b1b6"),r=t.n(o);r.a},"8b5a":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{orderinfo:{}}},onLoad:function(n){this.orderinfo=JSON.parse(decodeURIComponent(n.orderinfo)),console.log(this.orderinfo),this.$u.toast(this.i18n.successful+this.i18n.MyOrder)},computed:{i18n:function(){return this.$t("index")}},methods:{leftClick:function(){n.switchTab({url:"/pages/mine/mine"})}}};e.default=t}).call(this,t("df3c")["default"])},"8d8c":function(n,e,t){"use strict";(function(n,e){var o=t("47a9");t("abeb");o(t("3240"));var r=o(t("25fa"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(r.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])},a9d5:function(n,e,t){"use strict";t.r(e);var o=t("8b5a"),r=t.n(o);for(var i in o)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(i);e["default"]=r.a},b1b6:function(n,e,t){},ec86:function(n,e,t){"use strict";t.d(e,"b",(function(){return r})),t.d(e,"c",(function(){return i})),t.d(e,"a",(function(){return o}));var o={uNavbar:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-navbar/u-navbar")]).then(t.bind(null,"f3ae"))}},r=function(){var n=this.$createElement;this._self._c},i=[]}},[["8d8c","common/runtime","common/vendor"]]]);
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/orderinfo"],{"147a":function(n,e,t){},"35a1":function(n,e,t){"use strict";(function(n,e){var r=t("4ea4");t("f93b");r(t("66fd"));var o=r(t("8079"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(o.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},"5abc":function(n,e,t){"use strict";var r=t("147a"),o=t.n(r);o.a},8079:function(n,e,t){"use strict";t.r(e);var r=t("9789"),o=t("ff47");for(var u in o)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(u);t("5abc");var i,a=t("f0c5"),c=Object(a["a"])(o["default"],r["b"],r["c"],!1,null,"66b183e6",null,!1,r["a"],i);e["default"]=c.exports},9789:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return u})),t.d(e,"a",(function(){return r}));var r={uNavbar:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-navbar/u-navbar")]).then(t.bind(null,"b6bd"))}},o=function(){var n=this,e=n.$createElement;n._self._c},u=[]},"9e74":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={data:function(){return{orderinfo:{}}},onLoad:function(n){this.orderinfo=JSON.parse(decodeURIComponent(n.orderinfo)),console.log(this.orderinfo),this.$u.toast(this.i18n.successful+this.i18n.MyOrder)},computed:{i18n:function(){return this.$t("index")}},methods:{leftClick:function(){n.switchTab({url:"/pages/mine/mine"})}}};e.default=t}).call(this,t("543d")["default"])},ff47:function(n,e,t){"use strict";t.r(e);var r=t("9e74"),o=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return r[n]}))}(u);e["default"]=o.a}},[["35a1","common/runtime","common/vendor"]]]);
+>>>>>>> 579513e8d49dc83955674b1c21f36077561569a7

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/orderinfo.wxml


+ 1 - 1
unpackage/dist/build/mp-weixin/pageB/orderinfo.wxss

@@ -1 +1 @@
-.orderinfo.data-v-fa7c2f78{width:702rpx;height:184rpx;background:#fff;border-radius:16rpx;margin-top:20rpx;padding:36rpx 28rpx 0;box-sizing:border-box}.orderinfo .num.data-v-fa7c2f78{font-family:SFPro;font-weight:400;font-size:26rpx;color:#555;line-height:30rpx;text-align:left;font-style:normal}.back.data-v-fa7c2f78{padding:20rpx 24rpx;box-sizing:border-box}.back .top.data-v-fa7c2f78{width:702rpx;height:100rpx;background:linear-gradient(291deg,#fff4f4,#fbdfdf 100%,#fbdfdf 0);border-radius:16rpx 16rpx 0 0;border:1rpx solid;border-image:linear-gradient(270deg,#fff,hsla(0,0%,100%,0)) 1 1;padding:0 24rpx;box-sizing:border-box}.back .top .success.data-v-fa7c2f78{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#222;line-height:44rpx;text-align:left;font-style:normal}.back .top .sun.data-v-fa7c2f78{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#f83224;line-height:34rpx;text-align:left;font-style:normal}.back .address.data-v-fa7c2f78{width:702rpx;background:#fff;border-radius:16rpx;padding:1rpx 32rpx;box-sizing:border-box}.back .address .name.data-v-fa7c2f78{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#222;line-height:44rpx;text-align:left;font-style:normal}.back .address .info.data-v-fa7c2f78{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#777;line-height:36rpx;text-align:left;font-style:normal;margin-top:18rpx}
+.orderinfo.data-v-66b183e6{width:702rpx;height:184rpx;background:#fff;border-radius:16rpx;margin-top:20rpx;padding:36rpx 28rpx 0;box-sizing:border-box}.orderinfo .num.data-v-66b183e6{font-family:SFPro;font-weight:400;font-size:26rpx;color:#555;line-height:30rpx;text-align:left;font-style:normal}.back.data-v-66b183e6{padding:20rpx 24rpx;box-sizing:border-box}.back .top.data-v-66b183e6{width:702rpx;height:100rpx;background:linear-gradient(291deg,#fff4f4,#fbdfdf 100%,#fbdfdf 0);border-radius:16rpx 16rpx 0 0;border:1rpx solid;border-image:linear-gradient(270deg,#fff,hsla(0,0%,100%,0)) 1 1;padding:0 24rpx;box-sizing:border-box}.back .top .success.data-v-66b183e6{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#222;line-height:44rpx;text-align:left;font-style:normal}.back .top .sun.data-v-66b183e6{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:24rpx;color:#f83224;line-height:34rpx;text-align:left;font-style:normal}.back .address.data-v-66b183e6{width:702rpx;background:#fff;border-radius:16rpx;padding:1rpx 32rpx;box-sizing:border-box}.back .address .name.data-v-66b183e6{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#222;line-height:44rpx;text-align:left;font-style:normal}.back .address .info.data-v-66b183e6{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:26rpx;color:#777;line-height:36rpx;text-align:left;font-style:normal;margin-top:18rpx}

+ 5 - 1
unpackage/dist/build/mp-weixin/pageB/parcel.js

@@ -1 +1,5 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/parcel"],{"0946":function(t,n,e){"use strict";var i=e("22f4"),a=e.n(i);a.a},"0985":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{logistics_company_name:"",logistics_no:"",estimated_weight:""}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.Addparcel})},methods:{offline:function(){var n=this;t.$u.http.post("/api/express-order/offline-create",{logistics_company_code:this.logistics_company_name,logistics_no:this.logistics_no,estimated_weight:this.estimated_weight}).then((function(e){n.$u.toast("添加成功"),setTimeout((function(){t.navigateBack()}),800)})).catch((function(){}))}}};n.default=e}).call(this,e("df3c")["default"])},1668:function(t,n,e){"use strict";e.r(n);var i=e("d77d"),a=e("f0b3");for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);e("0946");var c=e("828b"),u=Object(c["a"])(a["default"],i["b"],i["c"],!1,null,"40afa20d",null,!1,i["a"],void 0);n["default"]=u.exports},"22f4":function(t,n,e){},"51a4":function(t,n,e){"use strict";(function(t,n){var i=e("47a9");e("abeb");i(e("3240"));var a=i(e("1668"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(a.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},d77d:function(t,n,e){"use strict";e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){}));var i=function(){var t=this.$createElement;this._self._c},a=[]},f0b3:function(t,n,e){"use strict";e.r(n);var i=e("0985"),a=e.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);n["default"]=a.a}},[["51a4","common/runtime","common/vendor"]]]);
+<<<<<<< HEAD
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/parcel"],{"0946":function(t,n,e){"use strict";var i=e("22f4"),a=e.n(i);a.a},"0985":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{logistics_company_name:"",logistics_no:"",estimated_weight:""}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.Addparcel})},methods:{offline:function(){var n=this;t.$u.http.post("/api/express-order/offline-create",{logistics_company_code:this.logistics_company_name,logistics_no:this.logistics_no,estimated_weight:this.estimated_weight}).then((function(e){n.$u.toast("添加成功"),setTimeout((function(){t.navigateBack()}),800)})).catch((function(){}))}}};n.default=e}).call(this,e("df3c")["default"])},1668:function(t,n,e){"use strict";e.r(n);var i=e("d77d"),a=e("f0b3");for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);e("0946");var c=e("828b"),u=Object(c["a"])(a["default"],i["b"],i["c"],!1,null,"40afa20d",null,!1,i["a"],void 0);n["default"]=u.exports},"22f4":function(t,n,e){},"51a4":function(t,n,e){"use strict";(function(t,n){var i=e("47a9");e("abeb");i(e("3240"));var a=i(e("1668"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(a.default)}).call(this,e("3223")["default"],e("df3c")["createPage"])},d77d:function(t,n,e){"use strict";e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){}));var i=function(){var t=this.$createElement;this._self._c},a=[]},f0b3:function(t,n,e){"use strict";e.r(n);var i=e("0985"),a=e.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(o);n["default"]=a.a}},[["51a4","common/runtime","common/vendor"]]]);
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageB/parcel"],{"42cf":function(t,n,e){"use strict";var i=e("55bd"),a=e.n(i);a.a},4539:function(t,n,e){"use strict";e.r(n);var i=e("46b3"),a=e("4b1a");for(var c in a)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(c);e("42cf");var o,u=e("f0c5"),r=Object(u["a"])(a["default"],i["b"],i["c"],!1,null,"40afa20d",null,!1,i["a"],o);n["default"]=r.exports},"46b3":function(t,n,e){"use strict";var i;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return c})),e.d(n,"a",(function(){return i}));var a=function(){var t=this,n=t.$createElement;t._self._c},c=[]},"4b1a":function(t,n,e){"use strict";e.r(n);var i=e("c4b0"),a=e.n(i);for(var c in i)["default"].indexOf(c)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(c);n["default"]=a.a},"55bd":function(t,n,e){},c4b0:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{logistics_company_name:"",logistics_no:"",estimated_weight:""}},computed:{i18n:function(){return this.$t("index")}},onShow:function(){t.setNavigationBarTitle({title:this.i18n.Addparcel})},methods:{offline:function(){var n=this;t.$u.http.post("/api/express-order/offline-create",{logistics_company_code:this.logistics_company_name,logistics_no:this.logistics_no,estimated_weight:this.estimated_weight}).then((function(e){n.$u.toast("添加成功"),setTimeout((function(){t.navigateBack()}),800)})).catch((function(){}))}}};n.default=e}).call(this,e("543d")["default"])},f791:function(t,n,e){"use strict";(function(t,n){var i=e("4ea4");e("f93b");i(e("66fd"));var a=i(e("4539"));t.__webpack_require_UNI_MP_PLUGIN__=e,n(a.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])}},[["f791","common/runtime","common/vendor"]]]);
+>>>>>>> 579513e8d49dc83955674b1c21f36077561569a7

File diff suppressed because it is too large
+ 3 - 1
unpackage/dist/build/mp-weixin/pageB/recipientinfo.js


+ 2 - 1
unpackage/dist/build/mp-weixin/pageB/recipientinfo.json

@@ -3,6 +3,7 @@
   "enablePullDownRefresh": false,
   "usingComponents": {
     "u-checkbox-group": "/uview-ui/components/u-checkbox-group/u-checkbox-group",
-    "u-checkbox": "/uview-ui/components/u-checkbox/u-checkbox"
+    "u-checkbox": "/uview-ui/components/u-checkbox/u-checkbox",
+    "u-picker": "/uview-ui/components/u-picker/u-picker"
   }
 }

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageB/recipientinfo.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/applicationRefund/applicationRefund.js


File diff suppressed because it is too large
+ 1 - 0
unpackage/dist/build/mp-weixin/pageC/myPackage/component/packageCard.js


File diff suppressed because it is too large
+ 1 - 0
unpackage/dist/build/mp-weixin/pageC/orderForm/component/orderInofrmation.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/orderForm/orderForm.js


File diff suppressed because it is too large
+ 1 - 0
unpackage/dist/build/mp-weixin/pageC/orderFormDetail/component/commodityDetail.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/orderFormDetail/orderFormDetail.js


+ 4 - 0
unpackage/dist/build/mp-weixin/pageC/refundDetail/component/moneyDestination.js

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/moneyDestination"],{"127e":function(e,n,t){"use strict";t.r(n);var u=t("3d91"),o=t("4bf5");for(var i in o)["default"].indexOf(i)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(i);t("72e6");var r=t("828b"),a=Object(r["a"])(o["default"],u["b"],u["c"],!1,null,"4ee4b1a3",null,!1,u["a"],void 0);n["default"]=a.exports},"27c8":function(e,n,t){},"3d91":function(e,n,t){"use strict";t.d(n,"b",(function(){return o})),t.d(n,"c",(function(){return i})),t.d(n,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"f1b1"))},uSteps:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-steps/u-steps")]).then(t.bind(null,"ef97"))},uStepsItem:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-steps-item/u-steps-item")]).then(t.bind(null,"0358"))}},o=function(){var e=this.$createElement,n=(this._self._c,this.refundDetail.goods[0].refund.refund_price.split(".")),t=this.refundDetail.goods[0].refund.refund_price.split(".");this.$mp.data=Object.assign({},{$root:{g0:n,g1:t}})},i=[]},"4bf5":function(e,n,t){"use strict";t.r(n);var u=t("661a"),o=t.n(u);for(var i in u)["default"].indexOf(i)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(i);n["default"]=o.a},"661a":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={props:{show:{typeof:Boolean,default:!1},refundDetail:{typeof:Object,default:function(){return{}}}},data:function(){return{value:""}},methods:{open:function(){},handleChange:function(e){console.log(this.value),this.$emit("close",e)}}};n.default=u},"72e6":function(e,n,t){"use strict";var u=t("27c8"),o=t.n(u);o.a}}]);
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/moneyDestination"],{"08ba":function(e,n,t){"use strict";var u=t("3dd8"),o=t.n(u);o.a},"3dd8":function(e,n,t){},"443f":function(e,n,t){"use strict";t.r(n);var u=t("87e1"),o=t("9a0e");for(var i in o)["default"].indexOf(i)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(i);t("08ba");var r,a=t("f0c5"),f=Object(a["a"])(o["default"],u["b"],u["c"],!1,null,"4ee4b1a3",null,!1,u["a"],r);n["default"]=f.exports},"87e1":function(e,n,t){"use strict";t.d(n,"b",(function(){return o})),t.d(n,"c",(function(){return i})),t.d(n,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"2f21"))},uSteps:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-steps/u-steps")]).then(t.bind(null,"e946"))},uStepsItem:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-steps-item/u-steps-item")]).then(t.bind(null,"f082"))}},o=function(){var e=this,n=e.$createElement,t=(e._self._c,e.refundDetail.goods[0].refund.refund_price.split(".")),u=e.refundDetail.goods[0].refund.refund_price.split(".");e.$mp.data=Object.assign({},{$root:{g0:t,g1:u}})},i=[]},"8a45":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={props:{show:{typeof:Boolean,default:!1},refundDetail:{typeof:Object,default:function(){return{}}}},data:function(){return{value:""}},methods:{open:function(){},handleChange:function(e){console.log(this.value),this.$emit("close",e)}}};n.default=u},"9a0e":function(e,n,t){"use strict";t.r(n);var u=t("8a45"),o=t.n(u);for(var i in u)["default"].indexOf(i)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(i);n["default"]=o.a}}]);
+>>>>>>> 579513e8d49dc83955674b1c21f36077561569a7
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/refundDetail/component/moneyDestination-create-component',
     {

+ 4 - 0
unpackage/dist/build/mp-weixin/pageC/refundDetail/component/refundInProgress.js

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refundInProgress"],{"03b2":function(n,t,e){"use strict";e.r(t);var u=e("c44c"),r=e("0686");for(var f in r)["default"].indexOf(f)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(f);e("7a55");var i=e("828b"),a=Object(i["a"])(r["default"],u["b"],u["c"],!1,null,"4b1ecb2f",null,!1,u["a"],void 0);t["default"]=a.exports},"0686":function(n,t,e){"use strict";e.r(t);var u=e("683d"),r=e.n(u);for(var f in u)["default"].indexOf(f)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(f);t["default"]=r.a},"683d":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={props:{refundDetail:{typeof:Object,default:function(){return{}}}}};t.default=u},"7a55":function(n,t,e){"use strict";var u=e("f5da"),r=e.n(u);r.a},c44c:function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement,t=(this._self._c,this.refundDetail.goods.length),e=t>0?this.refundDetail.goods[0].refund.refund_price.split("."):null,u=t>0?this.refundDetail.goods[0].refund.refund_price.split("."):null;this.$mp.data=Object.assign({},{$root:{g0:t,g1:e,g2:u}})},r=[]},f5da:function(n,t,e){}}]);
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refundInProgress"],{"28ed":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={props:{refundDetail:{typeof:Object,default:function(){return{}}}}};n.default=r},"694d":function(e,n,t){"use strict";t.r(n);var r=t("8461"),u=t("6da1");for(var f in u)["default"].indexOf(f)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(f);t("8c6e");var a,o=t("f0c5"),c=Object(o["a"])(u["default"],r["b"],r["c"],!1,null,"4b1ecb2f",null,!1,r["a"],a);n["default"]=c.exports},"6da1":function(e,n,t){"use strict";t.r(n);var r=t("28ed"),u=t.n(r);for(var f in r)["default"].indexOf(f)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(f);n["default"]=u.a},"6e11":function(e,n,t){},8461:function(e,n,t){"use strict";var r;t.d(n,"b",(function(){return u})),t.d(n,"c",(function(){return f})),t.d(n,"a",(function(){return r}));var u=function(){var e=this,n=e.$createElement,t=(e._self._c,e.refundDetail.goods.length),r=t>0?e.refundDetail.goods[0].refund.refund_price.split("."):null,u=t>0?e.refundDetail.goods[0].refund.refund_price.split("."):null;e.$mp.data=Object.assign({},{$root:{g0:t,g1:r,g2:u}})},f=[]},"8c6e":function(e,n,t){"use strict";var r=t("6e11"),u=t.n(r);u.a}}]);
+>>>>>>> 579513e8d49dc83955674b1c21f36077561569a7
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/refundDetail/component/refundInProgress-create-component',
     {

+ 4 - 0
unpackage/dist/build/mp-weixin/pageC/refundDetail/component/refundSuccessful.js

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refundSuccessful"],{"606b":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={props:{refundDetail:{typeof:Object,default:function(){return{}}}}};t.default=u},"692a":function(n,t,e){"use strict";e.r(t);var u=e("606b"),r=e.n(u);for(var f in u)["default"].indexOf(f)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(f);t["default"]=r.a},"85de":function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},r=[]},8921:function(n,t,e){"use strict";e.r(t);var u=e("85de"),r=e("692a");for(var f in r)["default"].indexOf(f)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(f);e("e1b2");var a=e("828b"),c=Object(a["a"])(r["default"],u["b"],u["c"],!1,null,"2a04f148",null,!1,u["a"],void 0);t["default"]=c.exports},bb57:function(n,t,e){},e1b2:function(n,t,e){"use strict";var u=e("bb57"),r=e.n(u);r.a}}]);
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refundSuccessful"],{"137c":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={props:{refundDetail:{typeof:Object,default:function(){return{}}}}};t.default=u},"2fc8":function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return f})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){return u}));var f=function(){var n=this,t=n.$createElement;n._self._c},r=[]},"64e6":function(n,t,e){"use strict";e.r(t);var u=e("137c"),f=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(r);t["default"]=f.a},9728:function(n,t,e){"use strict";e.r(t);var u=e("2fc8"),f=e("64e6");for(var r in f)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return f[n]}))}(r);e("ba35");var c,a=e("f0c5"),i=Object(a["a"])(f["default"],u["b"],u["c"],!1,null,"2a04f148",null,!1,u["a"],c);t["default"]=i.exports},ba35:function(n,t,e){"use strict";var u=e("f85d"),f=e.n(u);f.a},f85d:function(n,t,e){}}]);
+>>>>>>> 579513e8d49dc83955674b1c21f36077561569a7
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/refundDetail/component/refundSuccessful-create-component',
     {

+ 4 - 0
unpackage/dist/build/mp-weixin/pageC/refundDetail/component/refusalToRefund.js

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refusalToRefund"],{"0dc9":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={props:{refundDetail:{typeof:Object,default:function(){return{}}}}};t.default=u},1478:function(n,t,e){"use strict";e.r(t);var u=e("0dc9"),f=e.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(r);t["default"]=f.a},"59c3":function(n,t,e){"use strict";var u=e("ae92"),f=e.n(u);f.a},"9b67":function(n,t,e){"use strict";e.r(t);var u=e("bd0f"),f=e("1478");for(var r in f)["default"].indexOf(r)<0&&function(n){e.d(t,n,(function(){return f[n]}))}(r);e("59c3");var a=e("828b"),c=Object(a["a"])(f["default"],u["b"],u["c"],!1,null,"209e2b02",null,!1,u["a"],void 0);t["default"]=c.exports},ae92:function(n,t,e){},bd0f:function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return f})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},f=[]}}]);
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageC/refundDetail/component/refusalToRefund"],{"19e1":function(n,t,e){"use strict";e.r(t);var u=e("3c56"),r=e.n(u);for(var a in u)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(a);t["default"]=r.a},"3c56":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={props:{refundDetail:{typeof:Object,default:function(){return{}}}}};t.default=u},"4d1b":function(n,t,e){"use strict";e.r(t);var u=e("a6b2"),r=e("19e1");for(var a in r)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(a);e("83b6");var f,c=e("f0c5"),o=Object(c["a"])(r["default"],u["b"],u["c"],!1,null,"209e2b02",null,!1,u["a"],f);t["default"]=o.exports},"5a44":function(n,t,e){},"83b6":function(n,t,e){"use strict";var u=e("5a44"),r=e.n(u);r.a},a6b2:function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){return u}));var r=function(){var n=this,t=n.$createElement;n._self._c},a=[]}}]);
+>>>>>>> 579513e8d49dc83955674b1c21f36077561569a7
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageC/refundDetail/component/refusalToRefund-create-component',
     {

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageC/refundDetail/refundDetail.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/afterSalesDetail.js


+ 4 - 0
unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/component/applicationInformation.js

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesDetail/component/applicationInformation"],{"0ba5":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a={props:{orderInformation:{typeof:Object,default:function(){return{}}}},data:function(){return{}}};t.default=a},"29e1":function(n,t,e){"use strict";e.r(t);var a=e("c287"),r=e("3439");for(var u in r)["default"].indexOf(u)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(u);e("2bda");var o=e("828b"),f=Object(o["a"])(r["default"],a["b"],a["c"],!1,null,"479f5734",null,!1,a["a"],void 0);t["default"]=f.exports},"2bda":function(n,t,e){"use strict";var a=e("e2b1"),r=e.n(a);r.a},3439:function(n,t,e){"use strict";e.r(t);var a=e("0ba5"),r=e.n(a);for(var u in a)["default"].indexOf(u)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(u);t["default"]=r.a},c287:function(n,t,e){"use strict";e.d(t,"b",(function(){return a})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){}));var a=function(){var n=this.$createElement;this._self._c},r=[]},e2b1:function(n,t,e){}}]);
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesDetail/component/applicationInformation"],{"2ec4":function(n,t,e){"use strict";e.r(t);var r=e("4243"),a=e("8177");for(var u in a)["default"].indexOf(u)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(u);e("51ea");var f,o=e("f0c5"),c=Object(o["a"])(a["default"],r["b"],r["c"],!1,null,"479f5734",null,!1,r["a"],f);t["default"]=c.exports},4243:function(n,t,e){"use strict";var r;e.d(t,"b",(function(){return a})),e.d(t,"c",(function(){return u})),e.d(t,"a",(function(){return r}));var a=function(){var n=this,t=n.$createElement;n._self._c},u=[]},"49b1":function(n,t,e){},"51ea":function(n,t,e){"use strict";var r=e("49b1"),a=e.n(r);a.a},"5b13":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r={props:{orderInformation:{typeof:Object,default:function(){return{}}}},data:function(){return{}}};t.default=r},8177:function(n,t,e){"use strict";e.r(t);var r=e("5b13"),a=e.n(r);for(var u in r)["default"].indexOf(u)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(u);t["default"]=a.a}}]);
+>>>>>>> 579513e8d49dc83955674b1c21f36077561569a7
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/afterSalesDetail/component/applicationInformation-create-component',
     {

File diff suppressed because it is too large
+ 1 - 0
unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/component/commodityDetail.js


+ 4 - 0
unpackage/dist/build/mp-weixin/pageD/afterSalesDetail/component/refusePopup.js

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesDetail/component/refusePopup"],{"2b24":function(e,n,t){"use strict";var u=t("46a5"),o=t.n(u);o.a},"46a5":function(e,n,t){},"4d13":function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={props:{show:{typeof:Boolean,default:!1}},watch:{show:function(e){e||(this.value2="")}},data:function(){return{value2:""}},methods:{close:function(){}}};n.default=u},"8fda":function(e,n,t){"use strict";t.r(n);var u=t("4d13"),o=t.n(u);for(var a in u)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(a);n["default"]=o.a},"94c2":function(e,n,t){"use strict";t.r(n);var u=t("eb47"),o=t("8fda");for(var a in o)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(a);t("2b24");var r=t("828b"),i=Object(r["a"])(o["default"],u["b"],u["c"],!1,null,"86e8a146",null,!1,u["a"],void 0);n["default"]=i.exports},eb47:function(e,n,t){"use strict";t.d(n,"b",(function(){return o})),t.d(n,"c",(function(){return a})),t.d(n,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"f1b1"))},"u-Textarea":function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u--textarea/u--textarea")]).then(t.bind(null,"2a30"))}},o=function(){var e=this.$createElement;this._self._c},a=[]}}]);
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/afterSalesDetail/component/refusePopup"],{"15b7":function(e,n,t){},5393:function(e,n,t){"use strict";t.r(n);var u=t("d692"),o=t("9ee6");for(var a in o)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return o[e]}))}(a);t("92aa");var r,c=t("f0c5"),f=Object(c["a"])(o["default"],u["b"],u["c"],!1,null,"86e8a146",null,!1,u["a"],r);n["default"]=f.exports},"92aa":function(e,n,t){"use strict";var u=t("15b7"),o=t.n(u);o.a},"9ee6":function(e,n,t){"use strict";t.r(n);var u=t("cf3f"),o=t.n(u);for(var a in u)["default"].indexOf(a)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(a);n["default"]=o.a},cf3f:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u={props:{show:{typeof:Boolean,default:!1}},watch:{show:function(e){e||(this.value2="")}},data:function(){return{value2:""}},methods:{close:function(){}}};n.default=u},d692:function(e,n,t){"use strict";t.d(n,"b",(function(){return o})),t.d(n,"c",(function(){return a})),t.d(n,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"2f21"))},"u-Textarea":function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u--textarea/u--textarea")]).then(t.bind(null,"0b05"))}},o=function(){var e=this,n=e.$createElement;e._self._c},a=[]}}]);
+>>>>>>> 579513e8d49dc83955674b1c21f36077561569a7
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/afterSalesDetail/component/refusePopup-create-component',
     {

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/afterSalesManage/afterSalesManage.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/commodityManage/commodityManage.js


+ 4 - 0
unpackage/dist/build/mp-weixin/pageD/commodityManage/component/goodsInformation.js

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/commodityManage/component/goodsInformation"],{"3d92":function(t,n,o){"use strict";o.d(n,"b",(function(){return e})),o.d(n,"c",(function(){return i})),o.d(n,"a",(function(){}));var e=function(){var t=this.$createElement,n=(this._self._c,this.productAndCommodity?null:this.itemInfo.labels.join(" | ")),o=this.itemInfo.goods.discount_price.split("."),e=this.itemInfo.goods.discount_price.split(".");this.$mp.data=Object.assign({},{$root:{g0:n,g1:o,g2:e}})},i=[]},8512:function(t,n,o){"use strict";o.r(n);var e=o("3d92"),i=o("dfdf");for(var u in i)["default"].indexOf(u)<0&&function(t){o.d(n,t,(function(){return i[t]}))}(u);o("953e");var a=o("828b"),d=Object(a["a"])(i["default"],e["b"],e["c"],!1,null,"5cb20660",null,!1,e["a"],void 0);n["default"]=d.exports},"953e":function(t,n,o){"use strict";var e=o("ea85"),i=o.n(e);i.a},be03:function(t,n,o){"use strict";var e=o("47a9");Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i=e(o("7ca3")),u=(0,i.default)({props:{status:{typeof:String,default:""},itemInfo:{typeof:Object,default:function(){return{}}},productAndCommodity:{typeof:String,default:""},batch:{typeof:Boolean,default:!1}},watch:{},computed:{},data:function(){return{obj:{url:"https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/136953/20/42322/162799/665e6a6cF32604c1e/b9586c7ae52dc284.jpg.avif",title:"La Chapelle Sport拉夏贝尔高…",price:"75.00"},lebelList:[]}}},"computed",{isPadding:function(){if("product"==this.productAndCommodity)return"padding: 28rpx 20rpx 20rpx;"},downOrGrounding:function(){return"down"!=this.itemInfo.goods.status&&"down"!=this.itemInfo.status}});n.default=u},dfdf:function(t,n,o){"use strict";o.r(n);var e=o("be03"),i=o.n(e);for(var u in e)["default"].indexOf(u)<0&&function(t){o.d(n,t,(function(){return e[t]}))}(u);n["default"]=i.a},ea85:function(t,n,o){}}]);
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/commodityManage/component/goodsInformation"],{"504a":function(t,n,e){},"52a1":function(t,n,e){"use strict";var o=e("504a"),a=e.n(o);a.a},"7a07":function(t,n,e){"use strict";e.r(n);var o=e("abee"),a=e("9516");for(var i in a)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(i);e("52a1");var u,r=e("f0c5"),c=Object(r["a"])(a["default"],o["b"],o["c"],!1,null,"5cb20660",null,!1,o["a"],u);n["default"]=c.exports},9516:function(t,n,e){"use strict";e.r(n);var o=e("9bdc"),a=e.n(o);for(var i in o)["default"].indexOf(i)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(i);n["default"]=a.a},"9bdc":function(t,n,e){"use strict";var o=e("4ea4");Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var a=o(e("9523")),i=(0,a.default)({props:{status:{typeof:String,default:""},itemInfo:{typeof:Object,default:function(){return{}}},productAndCommodity:{typeof:String,default:""},batch:{typeof:Boolean,default:!1}},watch:{},computed:{},data:function(){return{obj:{url:"https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/136953/20/42322/162799/665e6a6cF32604c1e/b9586c7ae52dc284.jpg.avif",title:"La Chapelle Sport拉夏贝尔高…",price:"75.00"},lebelList:[]}}},"computed",{isPadding:function(){if("product"==this.productAndCommodity)return"padding: 28rpx 20rpx 20rpx;"},downOrGrounding:function(){return"down"!=this.itemInfo.goods.status&&"down"!=this.itemInfo.status}});n.default=i},abee:function(t,n,e){"use strict";var o;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return i})),e.d(n,"a",(function(){return o}));var a=function(){var t=this,n=t.$createElement,e=(t._self._c,t.productAndCommodity?null:t.itemInfo.labels.join(" | ")),o=t.itemInfo.goods.discount_price.split("."),a=t.itemInfo.goods.discount_price.split(".");t.$mp.data=Object.assign({},{$root:{g0:e,g1:o,g2:a}})},i=[]}}]);
+>>>>>>> 579513e8d49dc83955674b1c21f36077561569a7
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/commodityManage/component/goodsInformation-create-component',
     {

+ 4 - 0
unpackage/dist/build/mp-weixin/pageD/components/agreePopup.js

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/components/agreePopup"],{"4bb8":function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return r})),t.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"f1b1"))}},o=function(){var n=this.$createElement;this._self._c},r=[]},a2b6:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{agreeShow:{typeof:Boolean,default:!1},title:{typeof:String,default:""}},watch:{agreeShow:function(){console.log(111)}},data:function(){return{}}};e.default=u},d700:function(n,e,t){"use strict";t.r(e);var u=t("a2b6"),o=t.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(r);e["default"]=o.a},eb1c:function(n,e,t){"use strict";var u=t("f4ad"),o=t.n(u);o.a},ed04:function(n,e,t){"use strict";t.r(e);var u=t("4bb8"),o=t("d700");for(var r in o)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(r);t("eb1c");var a=t("828b"),c=Object(a["a"])(o["default"],u["b"],u["c"],!1,null,"cd683952",null,!1,u["a"],void 0);e["default"]=c.exports},f4ad:function(n,e,t){}}]);
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/components/agreePopup"],{1218:function(n,e,t){},"179b":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={props:{agreeShow:{typeof:Boolean,default:!1},title:{typeof:String,default:""}},watch:{agreeShow:function(){console.log(111)}},data:function(){return{}}};e.default=u},"18a5":function(n,e,t){"use strict";t.r(e);var u=t("179b"),o=t.n(u);for(var r in u)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(r);e["default"]=o.a},"1c99":function(n,e,t){"use strict";t.r(e);var u=t("abe9"),o=t("18a5");for(var r in o)["default"].indexOf(r)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(r);t("e014");var a,c=t("f0c5"),f=Object(c["a"])(o["default"],u["b"],u["c"],!1,null,"cd683952",null,!1,u["a"],a);e["default"]=f.exports},abe9:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return r})),t.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"2f21"))}},o=function(){var n=this,e=n.$createElement;n._self._c},r=[]},e014:function(n,e,t){"use strict";var u=t("1218"),o=t.n(u);o.a}}]);
+>>>>>>> 579513e8d49dc83955674b1c21f36077561569a7
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/components/agreePopup-create-component',
     {

+ 4 - 0
unpackage/dist/build/mp-weixin/pageD/components/goodsInformation.js

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 (global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/components/goodsInformation"],{"290d2":function(t,n,o){},"4fda":function(t,n,o){"use strict";o.r(n);var e=o("5f15"),i=o("dc1f");for(var d in i)["default"].indexOf(d)<0&&function(t){o.d(n,t,(function(){return i[t]}))}(d);o("d79b");var u=o("828b"),c=Object(u["a"])(i["default"],e["b"],e["c"],!1,null,"694410d7",null,!1,e["a"],void 0);n["default"]=c.exports},"5f15":function(t,n,o){"use strict";o.d(n,"b",(function(){return e})),o.d(n,"c",(function(){return i})),o.d(n,"a",(function(){}));var e=function(){var t=this,n=t.$createElement,o=(t._self._c,t.productAndCommodity?null:t.itemInfo.labels.join(" | ")),e="product"==t.productAndCommodity?t.itemInfo.discount_price.split("."):null,i="product"==t.productAndCommodity?t.itemInfo.discount_price.split("."):null,d="product"!=t.productAndCommodity?t.itemInfo.price.split("."):null,u="product"!=t.productAndCommodity?t.itemInfo.price.split("."):null;t.$mp.data=Object.assign({},{$root:{g0:o,g1:e,g2:i,g3:d,g4:u}})},i=[]},"5f16":function(t,n,o){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={props:{status:{typeof:String,default:""},itemInfo:{typeof:Object,default:function(){return{}}},productAndCommodity:{typeof:String,default:""},batch:{typeof:Boolean,default:!1}},watch:{},data:function(){return{obj:{url:"https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/136953/20/42322/162799/665e6a6cF32604c1e/b9586c7ae52dc284.jpg.avif",title:"La Chapelle Sport拉夏贝尔高…",price:"75.00"},lebelList:[]}},computed:{isPadding:function(){if("product"==this.productAndCommodity)return"padding: 28rpx 20rpx 20rpx;"}}};n.default=e},d79b:function(t,n,o){"use strict";var e=o("290d2"),i=o.n(e);i.a},dc1f:function(t,n,o){"use strict";o.r(n);var e=o("5f16"),i=o.n(e);for(var d in e)["default"].indexOf(d)<0&&function(t){o.d(n,t,(function(){return e[t]}))}(d);n["default"]=i.a}}]);
+=======
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageD/components/goodsInformation"],{"4d5d":function(t,n,o){"use strict";o.r(n);var e=o("a7e7"),u=o("9ad9");for(var i in u)["default"].indexOf(i)<0&&function(t){o.d(n,t,(function(){return u[t]}))}(i);o("b930");var r,d=o("f0c5"),c=Object(d["a"])(u["default"],e["b"],e["c"],!1,null,"694410d7",null,!1,e["a"],r);n["default"]=c.exports},68437:function(t,n,o){},"9ad9":function(t,n,o){"use strict";o.r(n);var e=o("b900"),u=o.n(e);for(var i in e)["default"].indexOf(i)<0&&function(t){o.d(n,t,(function(){return e[t]}))}(i);n["default"]=u.a},a7e7:function(t,n,o){"use strict";var e;o.d(n,"b",(function(){return u})),o.d(n,"c",(function(){return i})),o.d(n,"a",(function(){return e}));var u=function(){var t=this,n=t.$createElement,o=(t._self._c,t.productAndCommodity?null:t.itemInfo.labels.join(" | ")),e="product"==t.productAndCommodity?t.itemInfo.discount_price.split("."):null,u="product"==t.productAndCommodity?t.itemInfo.discount_price.split("."):null,i="product"!=t.productAndCommodity?t.itemInfo.price.split("."):null,r="product"!=t.productAndCommodity?t.itemInfo.price.split("."):null;t.$mp.data=Object.assign({},{$root:{g0:o,g1:e,g2:u,g3:i,g4:r}})},i=[]},b900:function(t,n,o){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={props:{status:{typeof:String,default:""},itemInfo:{typeof:Object,default:function(){return{}}},productAndCommodity:{typeof:String,default:""},batch:{typeof:Boolean,default:!1}},watch:{},data:function(){return{obj:{url:"https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/136953/20/42322/162799/665e6a6cF32604c1e/b9586c7ae52dc284.jpg.avif",title:"La Chapelle Sport拉夏贝尔高…",price:"75.00"},lebelList:[]}},computed:{isPadding:function(){if("product"==this.productAndCommodity)return"padding: 28rpx 20rpx 20rpx;"}}};n.default=e},b930:function(t,n,o){"use strict";var e=o("68437"),u=o.n(e);u.a}}]);
+>>>>>>> 579513e8d49dc83955674b1c21f36077561569a7
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'pageD/components/goodsInformation-create-component',
     {

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/orderDetail/orderDetail.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/paymentOrder/paymentOrder.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/productDetails/productDetails.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pageD/supplyChainGoods/supplyChainGoods.js


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


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/express/express.wxml


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


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/index.wxml


File diff suppressed because it is too large
+ 1 - 0
unpackage/dist/build/mp-weixin/uni_modules/liu-indexed-list/components/liu-indexed-list/liu-indexed-list.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/uni_modules/liu-indexed-list/components/liu-indexed-list/liu-indexed-list.wxml


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/uni_modules/liu-indexed-list/components/liu-indexed-list/liu-indexed-list.wxss


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/vendor.js.map


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


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


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


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.js.map


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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