From bb5f574f2e704252038b4ea19dbcf9fe01eef208 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Thu, 28 Nov 2024 22:11:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/model/order.js                                 |  14 +
 config.js                                          |   1 +
 .../components/list/gourmet/productSelectList.vue  | 223 +++++++++++++-
 .../components/list/gourmet/productSubmit.vue      | 334 +++++++++++++++++++++
 pages_order/components/product/submit.vue          |  14 +-
 .../components/product/submitUnitSelect.vue        |   2 +-
 pages_order/gourmet/gourmetDetail.vue              |   2 +-
 pages_order/order/order.vue                        |  21 +-
 pages_order/order/orderDetail.vue                  |  33 +-
 static/image/address/icon.png                      | Bin 0 -> 4586 bytes
 static/image/address/selectIcon.png                | Bin 0 -> 1366 bytes
 store/store.js                                     |  13 +-
 12 files changed, 626 insertions(+), 31 deletions(-)
 create mode 100644 pages_order/components/list/gourmet/productSubmit.vue
 create mode 100644 static/image/address/icon.png
 create mode 100644 static/image/address/selectIcon.png

diff --git a/api/model/order.js b/api/model/order.js
index ef66884..f1362ac 100644
--- a/api/model/order.js
+++ b/api/model/order.js
@@ -3,6 +3,12 @@
 // 商城接口
 
 const api = {
+	// 商品-获取各项提示费用
+	getOrderPrice : {
+		url : '/order/getPrice', 
+		method : 'GET', 
+		limit : 500,
+	},
 	
 	// 商城-立即兑换商品
 	createPointsOrder : {
@@ -21,6 +27,14 @@ const api = {
 		showLoading : true,
 		limit : 1000,
 	},
+	// 商城-立即兑换商品，微信支付购买商品
+	createSumOrder : {
+		url: '/order/createSumOrder',
+		method: 'POST',
+		auth : true,
+		showLoading : true,
+		limit : 1000,
+	},
 	
 	// 商城-订单列表
 	getOrderList : {
diff --git a/config.js b/config.js
index 5a305c9..3379f1a 100644
--- a/config.js
+++ b/config.js
@@ -21,6 +21,7 @@ const config = {
 }
 
 
+
 // 默认配置
 const defaultConfig = {
 	mapKey : 'JYTBZ-DOY3Q-UCM5O-4FWQR-LCI7S-ZIBD3',//已修改
diff --git a/pages_order/components/list/gourmet/productSelectList.vue b/pages_order/components/list/gourmet/productSelectList.vue
index dcc0a6d..6c60a13 100644
--- a/pages_order/components/list/gourmet/productSelectList.vue
+++ b/pages_order/components/list/gourmet/productSelectList.vue
@@ -39,28 +39,153 @@
 							</view>
 						</view>
 						<view class="unit">
-							<uv-number-box v-model="item.selectNum" :max="item.num">
+							<uv-number-box 
+							v-model="selectNumMap[item.id]" 
+							:max="item.num"
+							>
 							</uv-number-box>
 						</view>
 					</view>
 				</view>
 			</uv-checkbox-group>
 		</view>
+		
+		<view class="action">
+			<view class="icon">
+				<image src="/static/image/cart/2.png" mode=""></image>
+				<view class="num">{{ checkboxValue.length }}</view>
+			</view>
+			<view class="price">
+				<view class="count">
+					合计
+					<view>
+						￥
+						<text>{{ totalPrice }}</text>
+					</view>
+				</view>
+				<view class="text">
+					共{{ checkboxValue.length }}件，已享受最高优惠
+				</view>
+			</view>
+			<view class="btn2" @click="toSubmit">结算</view>
+		</view>
+		
+		<productSubmit
+		ref="productSubmit"
+		:totalPrice="totalPrice"
+		:priceList="priceList"
+		@submit="submit"
+		/>
 	</view>
 </template>
 
 <script>
+	import productSubmit from './productSubmit'
+	import { mapState } from 'vuex'
 	export default {
+		components : {
+			productSubmit,
+		},
 		props : {
 			list : {
 				default : []
 			},
 		},
+		computed : {
+			...mapState(['priceMap']),
+			totalPrice(){//计算总金额
+				if(this.checkboxValue.length == 0){
+					return 0
+				}
+				
+				let price = Number(this.priceMap.pei_money) || 0
+				
+				this.list.forEach(n => {
+					if(this.checkboxValue.includes(n.id)){
+						price += (n.price || 0)
+						* (this.selectNumMap[n.id] || 1)
+					}
+				})
+				
+				return Number(price).toFixed(2)
+			},
+			priceList(){
+				if (this.checkboxValue.length == 0) {
+					return []
+				}
+				
+				let list = []
+				
+				this.list.forEach(n => {
+					if (this.checkboxValue.includes(n.id)) {
+						list.push({
+							price : n.price,
+							num : this.selectNumMap[n.id] || 1,
+							title : n.name,
+							shopId : n.id,
+						})
+					}
+				})
+				
+				return list
+			},
+		},
 		data() {
 			return {
-
+				checkboxValue : [],
+				selectNumMap : {},
 			};
-		}
+		},
+		methods : {
+			getDataThen(list){
+				list.forEach(n => {
+					if(!this.selectNumMap[n.id]){
+						this.selectNumMap[n.id] = 1
+					}
+				})
+			},
+			toSubmit(){
+				if (this.checkboxValue.length == 0) {
+					uni.showToast({
+						title: '请选择商品',
+						icon: 'none'
+					})
+					return
+				}
+				this.$refs.productSubmit.open()
+			},
+			submit({addressId}){
+				if(!addressId){
+					uni.showToast({
+						title: '请选择地址',
+						icon: 'none'
+					})
+					return
+				}
+				
+				
+				
+				this.$api('createSumOrder', {
+					addressId,
+					list : JSON.stringify(this.priceList)
+				}, res => {
+					if(res.code == 200){
+						uni.requestPaymentWxPay(res)
+						.then(res => {
+							uni.showToast({
+								title: '下单成功',
+								icon: 'none'
+							})
+							
+							setTimeout(uni.navigateTo, 700, {
+								url: '/pages_order/order/order'
+							})
+						})
+					}
+				})
+				
+			},
+		},
 	}
 </script>
 
@@ -139,5 +264,97 @@
 				}
 			}
 		}
+		
+		
+		.action {
+			width: 700rpx;
+			position: fixed;
+			bottom: 60rpx;
+			left: 25rpx;
+			background-color: #fff;
+			height: 130rpx;
+			border-radius: 65rpx;
+			box-shadow: 0 0 6rpx 6rpx #00000010;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			overflow: hidden;
+			z-index: 99;
+			.icon {
+				position: relative;
+				width: 80rpx;
+				height: 80rpx;
+				margin: 0 20rpx;
+		
+				image {
+					width: 80rpx;
+					height: 80rpx;
+				}
+		
+				.num {
+					position: absolute;
+					right: 10rpx;
+					top: 0rpx;
+					background-color: $uni-color;
+					color: #fff;
+					font-size: 18rpx;
+					border-radius: 50%;
+					height: 30rpx;
+					width: 30rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+				}
+			}
+		
+			.price {
+				.count {
+					display: flex;
+					font-size: 26rpx;
+					align-items: center;
+		
+					view {
+						color: $uni-color;
+						margin-left: 10rpx;
+						text {
+							font-size: 32rpx;
+							font-weight: 900;
+						}
+					}
+				}
+		
+				.text {
+					font-size: 22rpx;
+					color: #717171;
+				}
+			}
+		
+			.btn2 {
+				margin-left: auto;
+				background-color: $uni-color;
+				height: 100%;
+				padding: 0 50rpx;
+				color: #fff;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+		
+		.plus-create{
+			position: fixed;
+			right: 50rpx;
+			bottom: 30vh;
+			background-color: $uni-color;
+			color: #FFF;
+			width: 100rpx;
+			height: 100rpx;
+			border-radius: 50%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			flex-direction: column;
+			font-size: 20rpx;
+		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages_order/components/list/gourmet/productSubmit.vue b/pages_order/components/list/gourmet/productSubmit.vue
new file mode 100644
index 0000000..fc1fd22
--- /dev/null
+++ b/pages_order/components/list/gourmet/productSubmit.vue
@@ -0,0 +1,334 @@
+<template>
+	<uv-popup ref="popup" 
+	:round="30" 
+	bgColor="#f7f7f7">
+		<view class="content">
+
+			<!-- 地址 -->
+			<view class="address" @click="openAddress">
+				<image src="/static/image/address/selectIcon.png" mode=""></image>
+				<view>
+					{{ address.name }}
+				</view>
+				<view class="">
+					{{ address.addressDetail }}
+				</view>
+				<view class="icon">
+					<uv-icon size="30rpx" name="arrow-right"></uv-icon>
+				</view>
+			</view>
+
+			<!-- 优惠劵 -->
+			<!-- <view style="padding: 0 20rpx;
+			background-color: #fff;">
+				<uv-cell 
+				icon="coupon" 
+				title="优惠劵"
+				iconStyle="font-size: 34rpx;"
+				rightIconStyle="font-size: 34rpx;"
+				:value="couponText"
+				@click="$refs.couponPopup.open('bottom')"
+				isLink>
+				</uv-cell>
+			</view> -->
+			
+			
+			<!-- <view class="payInfoMessage">
+				<view style="font-weight: 900;">
+					下单说明：
+				</view>
+				<view class="">
+					租金：从物品确认收货开始计算￥{{ configList.depositPrice }}元/天
+				</view>
+				<view class="">
+					押金：将按照面积计算每平方厘米￥1元
+				</view>
+			</view> -->
+
+			<!-- 费用明细 -->
+			<view class="expense-detail">
+				<view class="title">
+					费用明细
+				</view>
+				<view class="detail" v-if="totalPrice">
+					<view>
+						应付款：￥{{ totalPrice }}
+					</view>
+					
+					<view>
+						<view class="">
+							配送费
+						</view>
+						<view class="">
+							
+						</view>
+						<view class="">
+							￥{{ priceMap.pei_money }}
+						</view>
+					</view>
+					
+					<view 
+					:key="index"
+					v-for="(item, index) in priceList">
+						<view class="">
+							{{ item.title }}
+						</view>
+						<view class="">
+							￥{{ item.price }}
+						</view>
+						<view class="">
+							x{{ item.num }}
+						</view>
+					</view>
+				</view>
+				
+			
+			</view>
+
+			<!-- 提交按钮 -->
+			<view class="submit-btn">
+				<view class="r" @click="orderPay">
+					{{ submiitTitle }}
+				</view>
+			</view>
+
+		</view>
+
+		<!-- <uv-popup ref="couponPopup" 
+		:round="30">
+			<couponList 
+			ref="couponList" 
+			height="60vh" 
+			:depositPrice="depositPrice"
+			:washPrice="washPrice"
+			:rentPrice="rentPrice"
+			:useType="0"
+			@select="selectCoupon" />
+		</uv-popup> -->
+
+		<uv-popup ref="addressPopup" :round="30">
+			<addressList ref="addressList" height="60vh" @select="selectAddress" />
+		</uv-popup>
+	</uv-popup>
+</template>
+
+<script>
+	import addressList from '../../address/addressList.vue'
+	// import couponList from './couponList.vue'
+	import { mapState } from 'vuex'
+	export default {
+		components: {
+			addressList,
+			// couponList,
+		},
+		props: {
+			submiitTitle: {
+				default: '立即下单',
+				type: String,
+			},
+			totalPrice : {//总金额
+				default : 0
+			},
+			priceList : {//商品列表
+				default : []
+			},
+		},
+		computed : {
+			...mapState(['configList', 'priceMap']),
+		},
+		data() {
+			return {
+				address: {
+					name: '请选择联系人',
+					addressDetail: '',
+				},
+				addressTotal: 0,
+				coupon : {
+					// price : 0,
+				},
+				couponText : '请选择',
+			}
+		},
+		methods: {
+			// 打开
+			open() {
+				this.$refs.popup.open('bottom')
+				// this.$refs.couponList.getData()
+				// this.$refs.couponPopup.close()
+
+				// 获取地址列表
+				this.$refs.addressList.getAddressList().then(res => {
+					this.addressTotal = res.total
+					if (this.addressTotal != 0) {
+						this.address = res.records[0]
+					}
+				})
+			},
+			// 计算优惠金额
+			getPrice(){
+				// 减免押金
+				if(this.coupon.couponFlag && 
+				this.coupon.couponCondition <= this.depositPrice){
+					return {
+						coupon : this.coupon.couponPrice,
+						price : (this.price - this.coupon.couponPrice).toFixed(2),
+					}
+				}
+				// 减免租金
+				if(this.coupon.leaseCouponFlag && 
+				this.coupon.leaseCouponCondition <= this.rentPrice){
+					return {
+						coupon : this.coupon.leaseCouponPrice,
+						price : (this.price - this.coupon.leaseCouponPrice).toFixed(2),
+					}
+				}
+				
+				return {}
+			},
+			// 选择优惠劵
+			selectCoupon(e){
+				this.couponText = e.couponName
+				this.coupon = e
+				this.$refs.couponPopup.close()
+			},
+			// 关闭
+			close() {
+				this.$refs.popup.close()
+			},
+			// 打开选择地址
+			openAddress() {
+				if (this.addressTotal == 0) {
+					this.$refs.popup.close()
+					return uni.navigateTo({
+						url: '/pages_order/mine/address?type=back'
+					})
+				}
+				this.$refs.addressPopup.open('bottom')
+			},
+			// 选择地址
+			selectAddress(e) {
+				this.address = e
+				this.$refs.addressPopup.close()
+			},
+			orderPay() {
+				this.$emit('submit', {
+					addressId : this.address.id,
+					couponId : this.coupon.id
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.content {
+		max-height: 80vh;
+		overflow: hidden;
+		overflow-y: auto;
+		padding-top: 30rpx;
+
+		.address {
+			display: flex;
+			padding: 20rpx;
+			background-color: #fff;
+			margin-bottom: 20rpx;
+
+			image {
+				width: 30rpx;
+				height: 30rpx;
+				margin: 20rpx;
+			}
+
+			view {
+				margin: 20rpx;
+				overflow: hidden; //超出的文本隐藏
+				text-overflow: ellipsis; //溢出用省略号显示
+				white-space: nowrap; //溢出不换行
+			}
+
+			.icon {
+				margin-left: auto;
+			}
+		}
+		
+		.payInfoMessage{
+			line-height: 50rpx;
+			padding: 20rpx;
+			background-color: #fff;
+			font-size: 28rpx;
+		}
+
+		.expense-detail {
+			padding: 30rpx;
+			background-color: #fff;
+			font-size: 28rpx;
+
+			.title {
+				font-weight: 600;
+			}
+
+			.detail {
+				background-color: #F6F6F6;
+				color: #717171;
+				margin: 10rpx 0;
+				padding: 10rpx 20rpx;
+				line-height: 50rpx;
+				&>view{
+					display: flex;
+					justify-content: space-between;
+					&>view{
+						&:nth-child(1){
+							flex: 4;
+							overflow:hidden; //超出的文本隐藏
+							text-overflow:ellipsis; //溢出用省略号显示
+							white-space:nowrap; //溢出不换行
+						}
+						&:nth-child(2){
+							flex: 2;
+							text-align: right;
+						}
+						&:nth-child(3){
+							text-align: right;
+							flex: 1;
+						}
+					}
+				}
+			}
+			.coupon{
+				text-align: center;
+				color: #5c5;
+			}
+		}
+
+		.submit-btn {
+			width: 600rpx;
+			height: 80rpx;
+			color: #fff;
+			border-radius: 40rpx;
+			font-size: 28rpx;
+			margin: 20rpx auto;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border: 1rpx solid $uni-color;
+			overflow: hidden;
+
+			.l {
+				flex: 1;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				color: $uni-color;
+			}
+
+			.r {
+				background: $uni-color;
+				flex: 1;
+				height: 100%;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_order/components/product/submit.vue b/pages_order/components/product/submit.vue
index 0e71b0c..46d6951 100644
--- a/pages_order/components/product/submit.vue
+++ b/pages_order/components/product/submit.vue
@@ -28,8 +28,8 @@
 		</view> -->
 		
 		<view class="submit-btn"
-		@click="$emit('submit')">
-			<view class="l"
+		@click="submit">
+			<view class="r"
 			v-if="isProductPoint(detail)">
 				立即兑换
 			</view>
@@ -62,7 +62,15 @@
 			}
 		},
 		methods: {
-			
+			submit(){
+				if(this.detail.className == 0){
+					uni.navigateTo({
+						url: '/pages_order/gourmet/gourmetDetail?id=' + this.detail.shopId
+					})
+					return
+				}
+				this.$emit('submit')
+			},
 		}
 	}
 </script>
diff --git a/pages_order/components/product/submitUnitSelect.vue b/pages_order/components/product/submitUnitSelect.vue
index f953b65..180f23a 100644
--- a/pages_order/components/product/submitUnitSelect.vue
+++ b/pages_order/components/product/submitUnitSelect.vue
@@ -85,7 +85,7 @@
 			
 			<!-- 提交按钮 -->
 			<view class="submit-btn">
-				<view class="l"
+				<view class="r"
 				v-if="isProductPoint(detail)"
 				@click="exchange">
 					立即兑换
diff --git a/pages_order/gourmet/gourmetDetail.vue b/pages_order/gourmet/gourmetDetail.vue
index 19587aa..73761b3 100644
--- a/pages_order/gourmet/gourmetDetail.vue
+++ b/pages_order/gourmet/gourmetDetail.vue
@@ -229,7 +229,7 @@
 
 <style lang="scss" scoped>
 	.postDetail {
-		padding-bottom: env(safe-area-inset-bottom);
+		padding-bottom: calc(env(safe-area-inset-bottom) + 100rpx);
 		.box {
 			display: flex;
 			align-items: center;
diff --git a/pages_order/order/order.vue b/pages_order/order/order.vue
index e78a5db..e0f153a 100644
--- a/pages_order/order/order.vue
+++ b/pages_order/order/order.vue
@@ -22,32 +22,33 @@
 	
 				<view class="top">
 					<view class="service">
-						<text>{{item.projectId_dictText}}</text>
-						<text>{{ item.projectId_dictText }}</text>
+						<text>{{item.createTime}}</text>
 					</view>
 					<view class="status">
 						<text> {{ tabs[item.state + 1].name }}</text>
 					</view>
 				</view>
 	
-				<view class="content">
+				<view class="content"
+				:key="index"
+				v-for="(good, index) in item.cityOrderSkuList">
 	
 					<view class="left">
-						<image mode="aspectFill" :src="item.image"></image>
+						<image mode="aspectFill" :src="good.image"></image>
 					</view>
 	
 					<view class="right">
 						<view class="text-hidden-1">
-							客户姓名：{{ item.addressName }}
+							客户姓名：{{ good.addressName }}
 						</view>
 						<view class="text-hidden-1">
-							商品名称：{{ item.name }}
+							商品名称：{{ good.name }}
 						</view>
 						<view class="text-hidden-1">
-							收货地址：{{ item.addressCity + item.addressDetails }}
+							收货地址：{{ good.addressCity + good.addressDetails }}
 						</view>
 						<view class="text-hidden-1">
-							购买数量：{{ item.num }}
+							购买数量：{{ good.num }}
 						</view>
 						
 					</view>
@@ -158,7 +159,9 @@
 				align-items: center;
 				font-size: 30rpx;
 	
-				.service {}
+				.service {
+					font-size: 26rpx;
+				}
 	
 				.status {
 					font-size: 26rpx;
diff --git a/pages_order/order/orderDetail.vue b/pages_order/order/orderDetail.vue
index 2fe2a63..26e01ac 100644
--- a/pages_order/order/orderDetail.vue
+++ b/pages_order/order/orderDetail.vue
@@ -45,25 +45,28 @@
 				<view class="head-title">服务项目</view>
 			</view>
 		
-			<view class="flex">
+			<view class="flex"
+			v-for="(good, index) in order.cityOrderSkuList">
 				<view class="server-item">
 					
 					<view class="img-box">
-						<image :src="order.image" mode="aspectFill"></image>
+						<image :src="good.image" mode="aspectFill"></image>
 					</view>
 					
 					<view class="server-info">
 						
 						<view class="server-title">
-							{{order.name}}
+							{{good.name}}
 							<!-- <view class="coupon">领券立减</view> -->
 						</view>
 						
-						<view class="current-price">
-							价格<text class="unit">￥</text>{{order.price}}
+						<view class="current-price"
+						v-if="good.price">
+							价格<text class="unit">￥</text>{{good.price}}
 						</view>
-						<view class="current-price">
-							积分{{order.points}}
+						<view class="current-price"
+						v-if="good.points">
+							积分{{good.points}}
 						</view>
 						
 						
@@ -117,6 +120,15 @@
 						￥{{ order.price }}元
 					</view>
 				</view>
+				<view class="min_tips">
+					<view class="">
+						配送费
+					</view>
+					<view class="current-price"
+					v-if="order.peiMoney">
+						{{ order.peiMoney }}元
+					</view>
+				</view>
 				<view class="min_tips">
 					<view class="">
 						支付方式
@@ -326,6 +338,7 @@
 		width: calc(100% - 40px);
 		border-radius: 10px;
 
+		
 		.head-title {
 			font-family: PingFang SC, PingFang SC-Bold;
 			color: #2f2e2e;
@@ -343,7 +356,9 @@
 			box-sizing: border-box;
 			margin: 20rpx 0rpx;
 			width: 100%;
-
+			.current-price {
+				font-size: 24rpx;
+			}
 			.img-box {
 				width: 150rpx;
 				height: 150rpx;
@@ -464,7 +479,7 @@
 		}
 
 		.current-price {
-			font-size: 30rpx;
+			font-size: 28rpx;
 			color: #FD5100;
 		}
 
diff --git a/static/image/address/icon.png b/static/image/address/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..63955019b3acbc16d89118e5c35166c16d063cdb
GIT binary patch
literal 4586
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
U(t7@~iU0rr07*qoM6N<$g31`yL;wH)

literal 0
HcmV?d00001

diff --git a/static/image/address/selectIcon.png b/static/image/address/selectIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..12514747a8e99a5c19cdc3ba66699b1633796794
GIT binary patch
literal 1366
zcmV-c1*!UpP)<h;3K|Lk000e1NJLTq000~S001Ni1^@s6nj~6O00001b5ch_0Itp)
z=>Px)5J^NqR9Hu?muYNNRTRhn|NGv&DbNiR5EGTOBnSfOOkLs!6-|_)DG+LhMT`N<
z2S^$Of*4V#n5x8*keCom5JjMY84Ai$)L<YXh6r7V77)XtAc0cCB1LC;bB~$n5<2sy
zodMs+x#yhU+3vY#h(5mdZ^sO^LgqxJjF&{@F+zq4m_wjlfL0PGv~a)6()F0se2Ikg
zW|B^aQU!%VZ$Z>8i-ar#Fr+WX09+Trp0JkH1JsBX`T|iWog|?6pY9iy;1osHfOs$s
zP)`v-JIGaLPH-(tj$cdE?*SD5=<G19N(J>%#-IcRiqzW?v(i2D=(#)7+zpIHW;0X?
zVAZ|Cy7h@ew&tuXU*iR$qqcG2fvWN5Gml=MB!*GfJ4`|XT&CcPfEFPSgB;jvlTd1J
z2CaGb&HDN8Zs6^@QNt|h*9gI|6v|fs)S8xB$H@(+x@4~JEXwa6Q4^Gs#SnS{7><pi
z<xOKq-q(EopiL1dyUtS$;X4k(u}(VzV5zIT=}@XjWb=sJh?TQ~<QxF`$&Dh{3_DW9
z87&uhW6Riq16-~@K;$O0n}*=9wpE3DX5(+^)HM?D)Ic~l*;cH0veGPT{($!O;x|O(
zt0b?83tH>tmhV{7S;|Nc49~LL25kpXl9*l*oOcb*Eo3<0sU<ig!H5mP_hxxhX<w5g
z5grV97Ms8l0f#1@iPBFpyv=)>3WW)WHx#heC~sPpPAcz|k$TTyyPbPMJdp$x&Sxax
zjQ}tc4lioaZ@YcRYBL4K<n4fWp8zi=buIO$F<{cLCGaP-o^MV&R)3ek9Rj=p!0Hjb
z$hH{JcDO&6M9X{DwB`+W1C02+`@rM~3E9Q4-+P|KLkWg&iIy*|Y0V2V1<Kyh57_@?
z?FR68QVk&+8S#6*0XaFbOG){`XlX8G6?7)h@HX#4QkH_rU8*4OGwd&3K*|~iqZb)v
zl{vj}eY!x2-NUPc0stmDjya7I{=2hixM{1?$pX?bX*B1$r#GEU2O0?!*FeO1(m-0x
zELA}9mm5)@*(ktkPP0@5M`)-euCj)oQbDiz3-Yp=yMj=&on~o=o-8+yH&;_)Pt*?2
zI6KM)hx^zm%T_3CF_rN-rylve3oKj44vf0Z5)m#2-~phVoFb&nP*E?-e)%i@9!mWP
zw|zVNV?ZtJBXvO$xlDyNfEIM$?_tayfjP$gxtrq8Q@6KuqlVehtRF#+N~d1w%7~WF
zZZP!j5Z{URPIzb5{N)DZ?6bDg-^IQEf4)7Y6|UgqmewwFJ(j4pFGl9%W)E1T6sqo>
z$5TPkQ?tvPPdYA9@mc~5Z7nWPhHRz7q{zUDo2HUiF(~g~tZsMeCGVvN#+&xlo6iB<
z10X8{NT;Z1io9;z&fme=2ZM?F&YSnnqI}y{^8r+63=~wGHrH@w<5lM?lEPxpKW?N+
zbFBa`qze_uR+qAuvFz8gsdOA8jMp<Zfz-JP5M3)kUK-HDBI+%dui<Fd(wk9)ap>l!
za&0SI0djS(Kw&E(^9&U3O7$nk@me?;4f#Ez75E8=(iG5$qAXDTZ*Abqr$c>ZB4tXu
zCr~`KXUasl9*~?QgGyGJma1W?bCaairHMk~FV3^6D*=Ak<4mw$pq5#_hS+wV*4Jl*
zT~<Q=;;{;{62z2_-=tljmb#8NuFGUANE;ZNLScXL7!nl(9wGH6Lx*<LcOsltXq`g;
Y0pz0rP$nSM<p2Nx07*qoM6N<$f^q<bMF0Q*

literal 0
HcmV?d00001

diff --git a/store/store.js b/store/store.js
index 6633d8b..0e20044 100644
--- a/store/store.js
+++ b/store/store.js
@@ -9,6 +9,7 @@ import api from '@/api/api.js'
 const store = new Vuex.Store({
 	state: {
 		configList: {}, //配置列表
+		priceMap : {},//各项费用配置
 		shop : false,
 		userInfo : {}, //用户信息
 		city : {},//当前城市
@@ -26,11 +27,13 @@ const store = new Vuex.Store({
 	mutations: {
 		// 初始化配置
 		initConfig(state){
-			// api('getConfig', res => {
-			// 	if(res.code == 200){
-			// 		state.configList = res.result
-			// 	}
-			// })
+			api('getOrderPrice', res => {
+				if(res.code == 200){
+					res.result.forEach(n => {
+						state.priceMap[n.keyValue] = n.price
+					})
+				}
+			})
 			
 			let config = ['getPrivacyPolicy', 'getUserAgreement']
 			config.forEach(k => {