From e1ec6146fa5fbb965cd341df12167912b7bee3f0 Mon Sep 17 00:00:00 2001
From: yuanteng0011 <1876787513@qq.com>
Date: Fri, 20 Dec 2024 19:41:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AE=8C=E6=88=90=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/request.ts                                |   2 +-
 .../Shopping-cart/productmain/productmain.vue |   9 +-
 pages/address.vue                             |  57 --
 pages/mine/mineorders/mineorders.vue          |   4 +-
 .../product-paysuccess/product-paysuccess.vue | 775 ++++++++++--------
 .../order/product-waitpay/product-waitpay.vue | 766 +++++++++--------
 6 files changed, 781 insertions(+), 832 deletions(-)
 delete mode 100644 pages/address.vue

diff --git a/api/request.ts b/api/request.ts
index 69017c9..219aee6 100644
--- a/api/request.ts
+++ b/api/request.ts
@@ -2,4 +2,4 @@ export const Url = 'http://localhost:9092/api' //后端接口文档
 export const testUrl = 'http://123.249.108.160:8888/api'  //自己组的服务器接口地址
 export const suiUrl = 'http://154.8.193.216:9092/api'  //隋宇霏的接口地址
 
-export const baseUrl = Url
\ No newline at end of file
+export const baseUrl = testUrl
\ No newline at end of file
diff --git a/pages/Shopping-cart/productmain/productmain.vue b/pages/Shopping-cart/productmain/productmain.vue
index e74d073..ea2c979 100644
--- a/pages/Shopping-cart/productmain/productmain.vue
+++ b/pages/Shopping-cart/productmain/productmain.vue
@@ -20,7 +20,7 @@
 	          <view class="flex-row flex-1 self-center group_2">
 	            <image
 	              class="shrink-0 image"
-	              :src="item.cartGoodVO.goodImg"
+	              :src="item.cartGoodVO.goodImg.split(';')[0]"
 								@click="jump_product(item.goodId)"
 	            />
 	            <view class="flex-col flex-1 group_3 ml-12">
@@ -233,11 +233,6 @@ const checkBoxChange =(event)=>{
 	event.detail.value.forEach((item)=>{  //将选中的商品信息赋值给checkedData
 		console.log('products.value[parseInt(item)].goodId',products.value[parseInt(item)].goodId);
 		if(products.value[parseInt(item)] !== null) {
-			// console.log('item--->',item);
-			// checkedData.value[count] = {
-			// 	goodId: products.value[parseInt(item)].goodId,
-			// 	quantity: products.value[parseInt(item)].quantity,
-			// }
 			checkedData.value.push(products.value[parseInt(item)].id)
 			// console.log(products.value[parseInt(item)].goodId);
 			count += 1
@@ -301,7 +296,7 @@ const editOrSettle = async ()=>{   //去结算或者删除状态方法
 	// console.log('要传到订单详情页面的checked--->',checkedData.value);
 	if(stateText.value.bottomBtn === '去结算') {
 		const res = await uni.request({
-			url: baseUrl + '/cart/cart/list/error',
+			url: baseUrl + '/cart/submit/error',
 			method: 'POST',
 			header: {
 				'cookie': wx.getStorageSync('cookie')
diff --git a/pages/address.vue b/pages/address.vue
deleted file mode 100644
index 40a3510..0000000
--- a/pages/address.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<template>
-  <view>
-    <uni-data-picker v-slot:default="{data, error, options}" :localdata="items" popup-title="选择省/市/区" @change="onchange" @nodeclick="onnodeclick">
-		 <view class="picker" :style="pik">{{ tempSelected }}</view>
-	</uni-data-picker>
-  </view>
-</template>
-
-<script setup lang="ts">
- import {ref, onMounted} from 'vue'
- import data from './area.json' 
- import emitter from '../../../utils/emitter';
-
- const items = ref(data)
- const selected = ref('选择省/市/区')
- const selectedItem = ref([])
- const pik = ref({color: '#CFCFCF'})
- 
- const tempSelected = ref('选择省/市/区')
- 
- 
- onMounted(() => {
-	 emitter.on('addRegion', (val:any) => {
-		 selected.value = val
-		 pik.value.color = "#000"
-		 if(selected.value.length > 11) tempSelected.value = selected.value.slice(0, 11) + '...'
-		 else tempSelected.value = selected.value
-	 })
- })
- 
- const onchange = (e) => {
-	 selectedItem.value = e.detail.value
-	 selected.value = ""
-	 selectedItem.value.map((it, index) => {
-		 selected.value += it.text
-		 if(index != 2)
-		 selected.value += "/"
-	 })
-	 if(selected.value.length > 11) tempSelected.value = selected.value.slice(0, 11) + '...'
-	 else tempSelected.value = selected.value
-	 pik.value.color = "#000"
-	 emitter.emit('region', selected.value)
- }
- const onnodeclick = (node) => {
-	console.log(node)
- }
-    
-  
-</script>
-
-<style lang="scss" scoped>
-	.picker{
-		font-size: 35rpx;
-		line-height: 100rpx;
-	}
-</style>
-
diff --git a/pages/mine/mineorders/mineorders.vue b/pages/mine/mineorders/mineorders.vue
index 7fa6994..c2acf24 100644
--- a/pages/mine/mineorders/mineorders.vue
+++ b/pages/mine/mineorders/mineorders.vue
@@ -208,8 +208,8 @@
 	}  
 	const goToText = (index) => {
 		uni.navigateTo({
-			url: '../../../pages/mine/OrderDetails/OrderDetails?info=' + JSON.stringify(Status.value
-				.displayedOrders[index]),
+			// url: '../../../pages/mine/OrderDetails/OrderDetails?info=' + JSON.stringify(Status.value.displayedOrders[index]),
+			url: '../../../pages/order/product-waitpay/product-waitpay?info' + JSON.stringify(Status.value.displayedOrders[index]) 
 		})
 	}
 </script>
diff --git a/pages/order/product-paysuccess/product-paysuccess.vue b/pages/order/product-paysuccess/product-paysuccess.vue
index 9f0ddba..82562e6 100644
--- a/pages/order/product-paysuccess/product-paysuccess.vue
+++ b/pages/order/product-paysuccess/product-paysuccess.vue
@@ -1,452 +1,499 @@
 <template>
 	<view class="flex-col page">
-	  <view class="flex-col">
-	    <!-- <view class="flex-col justify-start items-start image-wrapper">
-	      <image
-	        class="image"
-	        src="https://ide.code.fun/api/image?token=6710b0541511d900114acbc6&name=a5af1f04bfd2af602d9d0f811b50717c.png"
-	      />
-	    </view> -->
-	    <view class="flex-col group">
-	      <view class="flex-row items-center section">
-	        <image
-	          class="image_2"
-	          src="https://ide.code.fun/api/image?token=6710b0541511d900114acbc6&name=ed4d5bcc4901016159530a1e5493a83f.png"
-	        />
-	        <view class="ml-6 flex-col items-start flex-1">
-	          <text class="font text">等待买家付款</text>
-	          <text class="font_2 text_2 mt-5">请于13分51秒内付款，超时订单将自动关闭</text>
-	        </view>
-	      </view>
-	      <view class="flex-row items-center section_2 mt-7">
-	        <image
-	          class="shrink-0 image_3"
-	          src="https://ide.code.fun/api/image?token=6710b0541511d900114acbc6&name=5da41d16a3c58ce9514d9a7f9ee5a577.png"
-	        />
-	        <view class="ml-8 flex-col items-start flex-1">
-	          <text class="font text_3">张三 15888610253</text>
-	          <text class="mt-12 font_2 text_4">黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院</text>
-	        </view>
-	      </view>
-	      <view class="flex-col section_3 mt-7">
-	        <view class="flex-row justify-between items-end self-stretch group_2">
-	          <view class="flex-row">
-	            <image
-	              class="image_4"
-	              src="https://ide.code.fun/api/image?token=6710b0541511d900114acbc6&name=1ab7a54755e0a23722c1b9dd0ae981c4.png"
-	            />
-	            <view class="flex-col group_3 ml-17">
-	              <view class="flex-col">
-	                <view class="flex-row self-stretch">
-	                  <text class="font">非遗绒花</text>
-	                  <text class="ml-4 font">【材料包】</text>
-	                </view>
-	                <text class="self-start font_2 text_5 mt-11">已选种类：紫色</text>
-	              </view>
-	              <view class="mt-38 flex-row items-center">
-	                <view class="flex-row items-center group_4">
-	                  <text class="text_6">138.</text>
-	                  <image
-	                    class="image_5 image_6"
-	                    src="https://ide.code.fun/api/image?token=6710b0541511d900114acbc6&name=4223cdafed72fca52c442dae885cee9c.png"
-	                  />
-	                </view>
-	                <text class="font_3 text_7">00</text>
-	              </view>
-	            </view>
-	          </view>
-	          <text class="font_3 text_8">×1</text>
-	        </view>
-	        <view class="flex-row justify-between items-center self-stretch group_5">
-	          <text class="font_4 text_9">商品金额</text>
-	          <view class="flex-row items-center group_6">
-	            <image
-	              class="shrink-0 image_5"
-	              src="https://ide.code.fun/api/image?token=6710b0541511d900114acbc6&name=4223cdafed72fca52c442dae885cee9c.png"
-	            />
-	            <text class="font_3">138.00</text>
-	          </view>
-	        </view>
-	        <view class="flex-row justify-between items-center self-stretch group_7">
-	          <text class="font_4 text_10">优惠券</text>
-	          <view class="flex-row items-center group_8">
-	            <image
-	              class="shrink-0 image_7"
-	              src="https://ide.code.fun/api/image?token=6710b0541511d900114acbc6&name=40498ff9c7a50c056417f381edf937db.png"
-	            />
-	            <text class="font_3">50.00</text>
-	          </view>
-	        </view>
-	        <view class="flex-row justify-end items-center self-stretch group_9">
-	          <view class="flex-row items-center group_10">
-	            <image
-	              class="image_5 image_8"
-	              src="https://ide.code.fun/api/image?token=6710b0541511d900114acbc6&name=f1d048b70eca2a37b0db8f3bd9989205.png"
-	            />
-	            <text class="font text_11">合计：</text>
-	          </view>
-	          <text class="font_3 text_12">88.00</text>
-	        </view>
-	        <view class="self-stretch divider view"></view>
-	        <text class="self-start font_4 text_13">买家留言</text>
-	        <view class="flex-col justify-start self-stretch text-wrapper">
-	          <text class="font_2 text_14">
-	            希望所使用的材料是可持续来源的，并且制作工艺要精细，以确保每一朵花瓣都能生动地展现出绒花的质感和美感。
-	          </text>
-	        </view>
-	        <view class="self-stretch divider view_2"></view>
-	        <view class="flex-row justify-between self-stretch group_11">
-	          <text class="font_2 text_15">订单编号：</text>
-	          <view class="flex-row items-center group_12">
-	            <text class="font_5 text_16">E20241005095840091406189</text>
-	            <view class="ml-2 flex-col justify-start items-center shrink-0 text-wrapper_2">
-	              <text class="text_17">复制</text>
-	            </view>
-	          </view>
-	        </view>
-	        <view class="flex-row justify-between items-center self-stretch group_13">
-	          <text class="font_2 text_18">创建时间：</text>
-	          <text class="font_5 text_19">2024-10-05 09:58:41</text>
-	        </view>
-	      </view>
+	  <view class="flex-row items-center section_2">
+	    <image
+	      class="image"
+	      :src="stateObject.img"
+	    />
+	    <view class="flex-col items-start flex-1 ml-6">
+	      <text class="font text">{{ stateObject.msg }}</text>
+	      <text class="text_2 mt-4">请于15分钟内付款，超时订单将自动关闭</text>
 	    </view>
 	  </view>
-	  <view class="flex-row justify-between items-center section_4 mt-284">
-	    <view class="flex-row items-center">
-	      <image
-	        class="shrink-0 image_9"
-	        src="https://ide.code.fun/api/image?token=6710b0541511d900114acbc6&name=2f24539fd031a6d564aa246956b79046.png"
-	      />
-	      <text class="text_21">88.</text>
-	      <text class="font_6 text_20">合计：</text>
-	      <text class="text_23">00</text>
+	  <view class="flex-row justify-between items-center section_3">
+	    <view class="flex-col group">
+	      <text class="self-start font text_3">{{ addressInfo.name }} {{ addressInfo.phone }}</text>
+	      <view class="flex-row items-center self-stretch">
+	        <image
+	          class="image_2"
+	          src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXZHjzkRH-dingwei.png"
+	        />
+	        <text class="font_2 text_4 ml-9">{{ addressInfo.region }}</text>
+	      </view>
+	      <text class="self-end font_2 text_6">{{ addressInfo.detailAddress }}</text>
 	    </view>
-	    <view class="flex-col justify-start items-center text-wrapper_3"><text class="font_6 text_22">去支付</text></view>
+	  </view>
+	  <view class="flex-col section_4">
+	    <view class="flex-col">
+	      <view class="flex-row justify-between goodsBox" v-for="(item, index) in productList" :key="index">
+	        <view class="flex-row">
+	          <image
+	            class="image_4"
+	            :src="item.goodSnapshot.goodImg.split(';')[0]"
+	          />
+	          <view class="flex-col group_2 ml-17">
+	            <view class="flex-row">
+	              <text class="font">{{ item.goodSnapshot.name }}</text>
+	              <text class="font text_11">【{{ item.goodSnapshot.type }}】</text>
+	            </view>
+	            <view class="flex-row items-center mt-53">
+	              <image
+	                class="image_5"
+	                src="https://ide.code.fun/api/image?token=6764d712797f850011f38d7b&name=2a1f46d015a316fa98edfbdad0f9921f.png"
+	              />
+	              <text class="font_3">{{ item.goodSnapshot.price }}</text>
+	              <!-- <text class="font_4">00</text> -->
+	            </view>
+	          </view>
+	        </view>
+	        <text class="self-start font_5 text_8 text_1">×{{ item.quantity }}</text>
+	      </view>
+	    </view>
+	    <view class="flex-col group_7 mt-6">
+	      <text class="self-start font_6 text_18">买家留言</text>
+	      <view class="flex-col justify-start self-stretch relative group_8 mt-5">
+	        <view class="group_9"></view>
+	        <text class="font_6 text_19 pos_4">
+	          {{ orderObject.note }}
+	        </text>
+	      </view>
+	    </view>
+	    <view class="flex-row justify-between items-center mt-6">
+	      <text class="font_6 text_20">订单编号：</text>
+	      <view class="flex-row items-center group_11">
+	        <view class="flex-col justify-start items-center text-wrapper view">
+	          <text class="font_7 text_22">复制</text>
+	        </view>
+	        <text class="font_4 text_21">{{ orderObject.orderNumber }}</text>
+	      </view>
+	    </view>
+	    <view class="flex-row justify-between items-center mt-6">
+	      <text class="font_6 text_23">创建时间：</text>
+	      <text class="font_4 text_24">{{ orderObject.createTime }}</text>
+	    </view>
+	    <view class="flex-row justify-between items-baseline group_1 mt-6" 
+				v-if="stateObject.state === '已退款'">
+	      <text class="font_6 text_25">退款时间：</text>
+	      <text class="font_4 text_26">{{ orderObject.updateTime }}</text>
+	    </view>
+	    <view class="flex-row justify-between group_16 mt-6" 
+				v-if="stateObject.state === '待收货'">
+	      <text class="font_6 text_27">物流单号：</text>
+	      <view class="flex-row items-center group_14">
+	        <text class="font_4">{{ orderObject.trackingNumber }}</text>
+	        <view class="flex-col justify-start items-center shrink-0 text-wrapper ml-5">
+	          <text class="font_7 text_22">复制</text>
+	        </view>
+	      </view>
+	    </view>
+	    <view class="flex-row justify-between items-baseline mt-6" 
+				v-if="stateObject.state === '交易成功'" >
+	      <text class="font_6 text_28">成交时间：</text>
+	      <text class="font_4 text_29">{{ orderObject.updateTime }}</text>
+	    </view>
+	  </view>
+	  <view class="flex-row justify-between items-center section_5"
+			v-if="stateObject.state != '交易成功'">
+	    <view class="flex-row items-center">
+	      <text class="font_8 text_30">合计：</text>
+	      <image
+	        class="shrink-0 image_8"
+	        src="https://ide.code.fun/api/image?token=6764d712797f850011f38d7b&name=549b29459342a9a09d24834be40eb53b.png"
+	      />
+	      <text class="text_31">{{ orderObject.totalAmount }}</text>
+	      <!-- <text class="text_33">00</text> -->
+	    </view>
+	    <view class="flex-col justify-start items-center text-wrapper_2" @click="stateSubmit">
+				<text class="font_8 text_32">{{ bottomBtn }}</text>
+			</view>
 	  </view>
 	</view>
 </template>
 
 <script setup>
-	
-	
+import { ref } from 'vue';
+import { onLoad , onShow } from "@dcloudio/uni-app"; 
+import { stateMap } from '../../../common/global';
+import { baseUrl } from '../../../api/request';
+const orderObject = ref({})  //后端传来的订单对象
+const addressInfo = ref({}) //地址信息
+const productList = ref([])  //订单涵盖的商品
+const stateObject = ref({})  //当前订单状态
+const bottomBtn = ref('去支付')  //底下按钮
+const oid = ref(0) 
+onLoad((options)=>{
+	oid.value = JSON.parse(options.oid)  //获取从上一个页面传来的值
+	console.log('当前订单ID为',oid.value);
+})
+onShow( async ()=>{
+	await getOrderItem()
+	await setBottomText()
+})
+const getOrderItem = async ()=>{  //获取当前订单详情
+	const res = await uni.request({
+		url: baseUrl + '/order/get/id',
+		method: 'POST',
+		header: {
+			'cookie': wx.getStorageSync("cookie")
+		},
+		data: { id: oid.value }
+	})
+	if(res.data.code === 1) {  //12.20待完善优惠卷快照信息
+		orderObject.value = res.data.data,
+		addressInfo.value = res.data.data.addressSnapshot,
+		productList.value = res.data.data.orderItemList
+		stateObject.value = stateMap.get(res.data.data.orderStatus)
+	}
+	console.log('地址信息--->',addressInfo.value);
+	console.log('商品信息为--->',productList.value);
+	console.log('此订单信息为',res.data);
+	console.log('订单状态---->',stateObject.value);
+}
+const setBottomText =()=>{  //更改按钮的字体
+	switch(stateObject.value.state) {
+		case '待支付': bottomBtn.value = '立即支付';break;
+		case '待发货': bottomBtn.value = '联系客服';break;
+		case '已发货': bottomBtn.value = '查看物流';break;
+		case '已退款': bottomBtn.value = '删除订单';break;
+		case '交易成功': bottomBtn.value = '删除订单';break;
+		default: bottomBtn.value = '删除订单'
+	}
+}
+const stateSubmit = () => {  //按钮状态改变的方法
+	if(bottomBtn.value === '立即支付') {   //重新支付
+		wxPay(oid.value)
+	} else if(bottomBtn.value === '删除订单') {
+		console.log('订单被删除');
+	} else {
+		console.log('联系客服');
+	}
+}
+const wxPay = async( oid )=> {  //传入订单id
+	try {
+		const res = await uni.request({
+			url: baseUrl + '/wechat/payment/create',
+			method: 'POST',
+			header: {
+				'cookie': wx.getStorageSync("cookie")
+			},
+			data: { id: oid }
+		})
+		const paymentData = res.data.data
+		wx.requestPayment({
+			appid: paymentData.appId,
+			nonceStr: paymentData.nonceStr,
+			package: paymentData.packageVal,
+			paySign: paymentData.paySign,
+			timeStamp: paymentData.timeStamp,
+			signType: paymentData.signType,
+			success(res) {
+				uni.showModal({
+					content: '支付成功',
+					showCancel: false
+				})
+				getOrderItem();
+				setBottomText();
+			},
+			fail(e) {
+				uni.showModal({
+					content: '支付失败，原因为:' + e.errMsg,
+					showCancel: false
+				})
+			}
+		})
+	}catch(error) {
+		console.error('支付请求失败',error);
+		uni.showModal({
+			content: '支付请求失败,请重试。',
+			showCancel: false
+		})
+	}
+}
 </script>
 
 <style lang="scss" scoped>
-.mt-5 {
-  margin-top: 9.38rpx;
+.goodsBox {
+	margin-bottom: 20rpx;
 }
-.mt-7 {
-  margin-top: 13.13rpx;
+.ml-9 {
+  margin-left: 16.88rpx;
+}
+.mt-53 {
+  margin-top: 99.38rpx;
 }
 .ml-17 {
   margin-left: 31.88rpx;
 }
-.mt-11 {
-  margin-top: 20.63rpx;
+.mt-5 {
+  margin-top: 9.38rpx;
 }
-.mt-284 {
-  margin-top: 532.5rpx;
+.ml-5 {
+  margin-left: 9.38rpx;
 }
 .page {
-  background-color: #fffaf0;
+  padding-top: 17.25rpx;
+  background-color: #f8e8c1;
+  background-image: url('https://ide.code.fun/api/image?token=6764d712797f850011f38d7b&name=b87e8545124c67f43b5de0d4813f79b5.png');
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
   width: 100%;
   overflow-y: auto;
   overflow-x: hidden;
-  // height: 100%;固定了
   height: 100vh;
-  overflow: hidden;
 }
-.image-wrapper {
-  padding: 15rpx 0;
-  background-color: #a0522d;
+.section_2 {
+  margin-left: 16.88rpx;
+  margin-right: 15rpx;
+  padding: 16.88rpx;
+  background-color: #ffffff;
+  border-radius: 18.75rpx;
 }
 .image {
-  margin-left: 16.88rpx;
-  width: 37.5rpx;
-  height: 37.5rpx;
-}
-.group {
-  padding: 15rpx 15rpx 0;
-}
-.section {
-  padding: 15rpx;
-  background-color: #fffef8;
-  border-radius: 18.75rpx;
-  border-left: solid 1.88rpx #818181;
-  border-right: solid 1.88rpx #818181;
-  border-top: solid 1.88rpx #818181;
-  border-bottom: solid 1.88rpx #818181;
-}
-.image_2 {
   width: 75rpx;
   height: 75rpx;
 }
-.section_2 {
-  padding: 33.75rpx 15rpx;
-  background-color: #fffef8;
-  border-radius: 18.75rpx;
-  border-left: solid 1.88rpx #818181;
-  border-right: solid 1.88rpx #818181;
-  border-top: solid 1.88rpx #818181;
-  border-bottom: solid 1.88rpx #818181;
-}
-.image_3 {
-  width: 43.13rpx;
-  height: 43.13rpx;
-}
-.font_2 {
-  font-size: 22.5rpx;
-  font-family: Open Sans;
-  line-height: 19.39rpx;
-  color: #818181;
-}
-.text_2 {
-  color: #6b6e72;
-  line-height: 21.34rpx;
-}
-.text_4 {
-  line-height: 20.91rpx;
-}
-.section_3 {
-  padding: 0 15rpx 26.25rpx 22.5rpx;
-  background-color: #fffef8;
-  border-radius: 18.75rpx;
-  border-left: solid 1.88rpx #818181;
-  border-right: solid 1.88rpx #818181;
-  border-top: solid 1.88rpx #818181;
-  border-bottom: solid 1.88rpx #818181;
-}
-.group_2 {
-  padding: 18.75rpx 0;
-  border-bottom: solid 1.88rpx #dfdfdf;
-}
-.image_4 {
-  margin-bottom: 5.63rpx;
-  border-radius: 9.38rpx;
-  width: 146.25rpx;
-  height: 165rpx;
-}
-.group_3 {
-  margin-top: 3.75rpx;
-}
 .font {
   font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 24.43rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 25.54rpx;
   color: #323232;
 }
-.text_3 {
-  line-height: 23.77rpx;
-}
 .text {
   color: #323233;
   font-size: 28.13rpx;
-  line-height: 26.08rpx;
+  line-height: 27.58rpx;
 }
-.text_5 {
-  line-height: 20.79rpx;
+.text_2 {
+  color: #6b6e72;
+  font-size: 22.5rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 22.14rpx;
 }
-.group_4 {
-  width: 90.66rpx;
+.section_3 {
+  margin: 15rpx 15rpx 0 16.88rpx;
+  padding: 24.81rpx 11.25rpx 25.26rpx 20.68rpx;
+  background-color: #ffffff;
+  border-radius: 18.75rpx;
+}
+.group {
+  width: 410.31rpx;
+  height: 84.94rpx;
+}
+.text_3 {
+  margin-left: 59.89rpx;
+  line-height: 22.67rpx;
+}
+.image_2 {
+  width: 43.13rpx;
+  height: 43.13rpx;
+}
+.font_2 {
+  font-size: 26.25rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 30rpx;
+  color: #818181;
+}
+.text_4 {
+  font-size: 24.38rpx;
 }
 .text_6 {
-  margin-left: 26.25rpx;
-  color: #323232;
-  font-size: 33.75rpx;
-  font-family: Open Sans;
-  font-weight: 600;
-  line-height: 24.88rpx;
+  margin-top: -10.26rpx;
+  font-size: 24.38rpx;
+}
+.text_5 {
+  color: #ffaaa5;
+  line-height: 24.41rpx;
+}
+.image_3 {
+  width: 24.38rpx;
+  height: 24.38rpx;
+}
+.section_4 {
+  margin: 15rpx 15rpx 110rpx 16.88rpx;
+  padding: 22.5rpx 22.63rpx 24.79rpx 24.38rpx;
+  background-color: #ffffff;
+  border-radius: 18.75rpx;
+}
+.image_4 {
+  border-radius: 9.38rpx;
+  width: 146.25rpx;
+  height: 165rpx;
+}
+.group_2 {
+  margin-top: 4.2rpx;
+  margin-bottom: 5.63rpx;
+}
+.text_11 {
+  line-height: 25.01rpx;
 }
 .image_5 {
   width: 30rpx;
   height: 30rpx;
 }
-.image_6 {
-  margin-left: -90rpx;
-}
 .font_3 {
-  font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 19.39rpx;
+  font-size: 33.75rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 22.54rpx;
   color: #323232;
 }
-.text_7 {
-  font-weight: 600;
-  line-height: 19.29rpx;
-}
-.text_8 {
-  margin-right: 11.25rpx;
-  margin-bottom: 7.5rpx;
-  line-height: 18.73rpx;
-}
-.group_5 {
-  margin-top: 26.25rpx;
-}
 .font_4 {
   font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 24.43rpx;
-  color: #818181;
-}
-.text_9 {
-  line-height: 24.28rpx;
-}
-.group_6 {
-  margin-right: 3.75rpx;
-}
-.group_7 {
-  margin-top: 13.13rpx;
-}
-.text_10 {
-  line-height: 24.26rpx;
-}
-.group_8 {
-  margin-right: 3.75rpx;
-}
-.image_7 {
-  width: 41.25rpx;
-  height: 30rpx;
-}
-.group_9 {
-  margin-top: 16.88rpx;
-  padding: 0 3.75rpx;
-}
-.group_10 {
-  width: 102.26rpx;
-}
-.image_8 {
-  margin-left: 71.25rpx;
-}
-.text_11 {
-  margin-left: -101.25rpx;
-  line-height: 24.09rpx;
-}
-.text_12 {
-  color: #fb8b05;
-}
-.divider {
-  background-color: #dfdfdf;
-  height: 1.88rpx;
-}
-.view {
-  margin-right: 7.5rpx;
-  margin-top: 16.88rpx;
-}
-.text_13 {
-  margin-top: 30rpx;
-  line-height: 24.21rpx;
-}
-.text-wrapper {
-  margin-right: 7.5rpx;
-  margin-top: 15rpx;
-  padding: 15rpx 0 11.25rpx;
-  background-color: #fffef8;
-  border-radius: 9.38rpx;
-  border-left: solid 1.88rpx #f0f0b5;
-  border-right: solid 1.88rpx #f0f0b5;
-  border-top: solid 1.88rpx #f0f0b5;
-  border-bottom: solid 1.88rpx #f0f0b5;
-}
-.text_14 {
-  margin-left: 15rpx;
-  margin-right: 18.75rpx;
-  line-height: 26.25rpx;
-}
-.view_2 {
-  margin-right: 7.5rpx;
-  margin-top: 18.75rpx;
-}
-.group_11 {
-  margin-top: 22.5rpx;
-}
-.text_15 {
-  line-height: 20.85rpx;
-}
-.group_12 {
-  margin-right: 7.5rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 17.53rpx;
+  color: #323232;
 }
 .font_5 {
-  font-size: 22.5rpx;
+  font-size: 26.25rpx;
   font-family: Open Sans;
+  line-height: 17.53rpx;
   color: #323232;
 }
-.text_16 {
-  line-height: 16.54rpx;
+.text_8 {
+  line-height: 18.73rpx;
 }
-.text-wrapper_2 {
-  background-color: #fffef8;
-  width: 50.63rpx;
-  height: 22.5rpx;
-  border-left: solid 0.94rpx #d1d1d1;
-  border-right: solid 0.94rpx #d1d1d1;
-  border-top: solid 0.94rpx #d1d1d1;
-  border-bottom: solid 0.94rpx #d1d1d1;
+.text_1 {
+  margin-right: 7.58rpx;
+  margin-top: 133.14rpx;
 }
-.text_17 {
-  color: #323232;
-  font-size: 18.75rpx;
-  font-family: Open Sans;
-  line-height: 17.38rpx;
+.font_6 {
+  font-size: 26.25rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 25.54rpx;
+  color: #818181;
 }
-.group_13 {
-  margin-top: 11.25rpx;
+.group_7 {
+  padding: 29.19rpx 0 16.88rpx;
+  border-top: solid 1.88rpx #dfdfdf;
+  border-bottom: solid 1.88rpx #dfdfdf;
 }
 .text_18 {
-  line-height: 20.7rpx;
+  margin-left: 2.36rpx;
+  line-height: 24.71rpx;
+}
+.group_8 {
+  margin-right: 3.62rpx;
+  padding-top: 9.86rpx;
+}
+.group_9 {
+  border-radius: 9.38rpx;
+  height: 84.38rpx;
+  border: solid 1.88rpx #ffffff;
 }
 .text_19 {
-  margin-right: 161.25rpx;
-  line-height: 16.63rpx;
+  line-height: 31.88rpx;
+  text-shadow: 0 1.88rpx #ffffff, 0 -1.88rpx #ffffff, 1.88rpx 0 #ffffff, -1.88rpx 0 #ffffff;
+  text-indent: 54.45rpx;
 }
-.section_4 {
-  position: fixed;
-  left: 0;
-  right: 0;
-  margin: auto;
-  bottom: 0;
-  padding: 15rpx 26.25rpx;
+.pos_4 {
+  position: absolute;
+  left: 12.17rpx;
+  right: 25.33rpx;
+  top: 50%;
+  transform: translateY(-50%);
+}
+.text_20 {
+  line-height: 25.84rpx;
+}
+.group_11 {
+  margin-right: 3.62rpx;
+  width: 368.34rpx;
+}
+.text-wrapper {
+  padding-bottom: 2.29rpx;
+  background-color: #ffffff;
+  width: 50.63rpx;
+  height: 22.5rpx;
+  border: solid 0.94rpx #d1d1d1;
+}
+.view {
+  margin-left: 317.72rpx;
+}
+.font_7 {
+  font-size: 18.75rpx;
+  font-family: Open Sans;
+  line-height: 17.53rpx;
+  color: #323232;
+}
+.text_22 {
+  line-height: 17.38rpx;
+}
+.text_21 {
+  margin-left: -368.34rpx;
+}
+.text_23 {
+  line-height: 24.71rpx;
+}
+.text_24 {
+  margin-right: 132.38rpx;
+}
+.group_1 {
+  padding: 0 2.38rpx;
+}
+.text_25 {
+  line-height: 24.51rpx;
+}
+.text_26 {
+  margin-right: 137.49rpx;
+}
+.group_16 {
+  padding: 0 3.32rpx;
+}
+.text_27 {
+  line-height: 25.84rpx;
+}
+.group_14 {
+  margin-right: 28.43rpx;
+}
+.text_28 {
+  line-height: 24.51rpx;
+}
+.text_29 {
+  margin-right: 139.88rpx;
+}
+.section_5 {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+  // margin-top: 78.75rpx;
+  padding: 16.88rpx 25.31rpx 15rpx;
   background-color: #ffffff;
 }
-.image_9 {
-  margin-left: 86.25rpx;
+.font_8 {
+  font-size: 30rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 27.77rpx;
+}
+.text_30 {
+  color: #000000;
+}
+.image_8 {
   width: 33.75rpx;
   height: 33.75rpx;
 }
-.text_21 {
-  color: #fbb612;
+.text_31 {
+  color: #ffaaa5;
   font-size: 37.5rpx;
   font-family: Open Sans;
   font-weight: 700;
   line-height: 27.62rpx;
 }
-.font_6 {
-  font-size: 30rpx;
-  font-family: Open Sans;
-  line-height: 27.62rpx;
-}
-.text_20 {
-  margin-left: -172.5rpx;
-  color: #000000;
-  line-height: 27.54rpx;
-}
-.text_23 {
-  margin-left: 78.75rpx;
-  color: #fbb612;
+.text_33 {
+  color: #ffaaa5;
   font-size: 30rpx;
   font-family: Open Sans;
   font-weight: 700;
   line-height: 22.05rpx;
 }
-.text-wrapper_3 {
-  padding: 22.5rpx 0;
-  background-color: #fbb612;
+.text-wrapper_2 {
+  padding: 20.63rpx 0 22.86rpx;
+  background-color: #ffaaa5;
   border-radius: 75rpx;
   width: 204.38rpx;
   height: 71.25rpx;
 }
-.text_22 {
+.text_32 {
   color: #ffffff;
-  line-height: 27.86rpx;
 }
 @import url(../../../common/css/global.css);
 </style>
diff --git a/pages/order/product-waitpay/product-waitpay.vue b/pages/order/product-waitpay/product-waitpay.vue
index 93eaa5e..40d3427 100644
--- a/pages/order/product-waitpay/product-waitpay.vue
+++ b/pages/order/product-waitpay/product-waitpay.vue
@@ -1,159 +1,153 @@
 <!-- 单个商品购买页面 -->
 <template>
-	<view class="flex-col page">
-	  <view class="flex-col justify-start">
-	    <view class="flex-col group">
-	      <view class="flex-col section">
-	        <view class="flex-row justify-between">
-	          <view class="flex-col">
-	            <text class="self-center font text">{{ addressRealInfo.region }}</text>
-	            <view class="flex-row items-center self-stretch">
-	              <image
-	                class="shrink-0 image_2"
-	                src=""
-	              />
-	              <text class="font_2 text_2 ml-7">{{ addressRealInfo.detailAddress }}</text>
-	            </view>
-	          </view>
-	          <view class="flex-row self-start group_2" @click="loadPop()">
-	            <image
-	              class="image_3"
-	              src=""
-	            />
-	            <text class="font_3 text_3">更换地址</text>
-	          </view>
-	        </view>
-	        <view class="flex-row items-baseline group_3 mt-4">
-	          <text class="font_2 text_4">{{ addressRealInfo.name }}</text>
-	          <text class="font_2 text_5">{{ addressRealInfo.phone }}</text>
-	        </view>
-	      </view>
-				<!-- 商品信息 -->
-	      <view class="flex-col section_2 mt-8" v-for="(item , index) in productArr" :key="index">
-	        <view class="flex-row">
-	          <image 
-			   class="image_4" 
-			   :src="item.goodVO.goodImg" />
-	          <view class="flex-col self-start group_4 ml-17">
-	            <view class="flex-row self-stretch">
-	              <text class="font">{{ item.goodVO.name }}</text>
-	              <text class="font ml-4">【{{ item.goodVO.type }}】</text>
-	            </view>
-	            <view class="flex-row self-stretch mt-12" >
-	              <!-- <view class="flex-col justify-start items-center text-wrapper" v-for="(item , index) in labelList" :key="index">
-	                <text class="font_2 text_7">#{{ labelList[index] }}</text>
-	              </view> -->
-	            </view>
-	          </view>
-	        </view>
-	        <view class="flex-row justify-between items-center group_5">
-	          <view class="flex-row items-center group_6">
-	            <text class="text_10">￥{{ item.goodVO.price }}</text>
-	          <!--  <image
-	              class="shrink-0 image_7 image_8"
-	              :src="rmb_32"
-	            /> -->
-	            <text class="font text_11">.00</text>
-	          </view>
-	          <view class="flex-row">
-	            <image 
-								class="image_5" 
-								src="" 
-								@click="shortNum(index)"
-								/>
-	            <view class="flex-col justify-start items-center text-wrapper_4 ml-2">
-	              <text class="font text_12">{{ item.quantity }}</text>
-	            </view>
-	            <image
-	              class="image_6 ml-2"
-	              src=""
-								@click="addNum(index)"
-	            />
-	          </view>
-	        </view>
-	        <view class="flex-row justify-end items-center group_7">
-	          <view class="group_8">
-	            <text class="font_2 text_13">注：购买商品均视为同意</text>
-	            <text class="font_2 text_14">用户须知</text>
-	          </view>
-	          <image
-	            class="shrink-0 image_9 ml-2"
-	            src=""
-	          />
-	        </view>
-	      </view>
-				<!-- 商品价格展示 -->
-	      <view class="flex-col section_3 mt-8">
-	        <view class="flex-row justify-between items-center group_9">
-	          <view class="flex-row">
-	            <!-- <text class="font_4 text_15">商品总价</text> -->
-	            <text class="font_5 text_16 ml-7">共 {{ productArr.length }} 件商品</text>
-	          </view>
-	          <!-- <view class="flex-row items-center">
-	            <image
-	              class="shrink-0 image_10"
-	              :src="rmb_36px"
-	            />
-	            <text class="font_6">{{ productObject.price }}</text>
-	          </view> -->
-	        </view>
-	        <view class="flex-col mt-25">
-						<!-- 优惠卷 -->
-	    <!--      <view class="flex-row justify-between group_10">
-	            <text class="font_4 text_17">优惠券</text>
-	            <view class="flex-row group_11">
-	              <image
-	                class="image_7 image_11"
-	                :src="you_hei"
-	              />
-	              <text class="font_5 text_18">{{ youhuijuan_num }}张优惠券可用</text>
-	            </view>
-	          </view> -->
-	          <view class="flex-col mt-9">
-	            <!-- <view class="flex-row justify-between items-center group_12">
-	              <text class="font_4 text_19">满{{ manjian }}减{{ manjian1 }}优惠</text>
-	              <view class="flex-row items-center">
-	                <image
-	                  class="shrink-0 image_10 image_12"
-	                  :src="rmb_cheng"
-	                />
-	                <text class="font_3 text_20">减</text>
-	                <text class="font_6 text_21"> {{ manjian1 }}.00 </text>
-	              </view>
-	            </view> -->
-	            <view class="flex-row justify-between items-center group_13">
-	              <text class="font_4 text_22">合计</text>
-	              <view class="flex-row items-center">
-	                <image
-	                  class="shrink-0 image_10"
-	                  src=""
-	                />
-	                <text class="font_6">{{ sumprice }}.00</text>
-	              </view>
-	            </view>
-	          </view>
-	        </view>
-	      </view>
-	      <view class="flex-col section_1 mt-8">
-	        <text class="self-start font_7">订单备注</text>
-	        <textarea class="text-wrapper_5 mt-11" v-model="note"  placeholder="备注建议提前协商(250字以内)"></textarea>
-	      </view>
-	    </view>
-	  </view>
-	  <view class="flex-row justify-between items-center section_4 mt-194" >
-	    <view class="flex-row items-center">
-	      <image
-	        class="shrink-0 image_10 image_13"
-	        src=""
-	      />
-	      <text class="font_7 text_24">应付：</text>
-	      <text class="text_25">{{ sumprice }}.</text>
-	      <text class="font_6 text_27">00</text>
-	    </view>
-	    <!-- <view class="flex-col justify-start items-center text-wrapper_6" @click="jump_pay"><text class="font_4 text_26">微信支付</text></view> -->
-			<view class="flex-col justify-start items-center text-wrapper_6" @click="createOrder"><text class="font_4 text_26">微信支付</text></view>
-	  </view>
-	</view>
+<view class="flex-col justify-start relative page">
+  <view class="flex-col group_1">
+		<!-- 地址信息 -->
+    <view class="flex-col section_2">
+      <view class="flex-row justify-between">
+        <view class="flex-col">
+          <text class="self-center font text">{{ addressRealInfo.region }}</text>
+          <view class="flex-row items-center self-stretch">
+            <image
+              class="shrink-0 image"
+              src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXZHjzkRH-dingwei.png"
+            />
+            <text class="font_2 text_2 ml-8">{{ addressRealInfo.detailAddress }}</text>
+          </view>
+        </view>
+        <view class="flex-row self-start group" @click="loadPop">
+          <text class="font_3 text_3">更换地址</text>
+          <image
+            class="shrink-0 image_2"
+            src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FfhDZdkOK-rightpink.png"
+          />
+        </view>
+      </view>
+      <view class="flex-row items-center group_2 mt-4">
+        <text class="font_2 text_4">{{ addressRealInfo.name }}</text>
+        <text class="font_2 text_5">手机:{{ addressRealInfo.phone }}</text>
+      </view>
+    </view>
+		<!-- 商品信息 -->
+    <view class="flex-col section_3">
+      <view class="flex-col self-stretch">
+        <view class="flex-row items-end group_18" v-for="(item, index) in productArr" :key="index">
+          <view class="flex-row items-end flex-1 group_19">
+            <image
+              class="shrink-0 image_3 image_4"
+              :src="item.cartGoodVO.goodImg.split(';')[0]"
+            />
+            <view class="flex-col flex-1 ml-17">
+              <view class="flex-row">
+                <text class="font">{{ item.cartGoodVO.name }}</text>
+                <text class="font text_1">【{{ item.cartGoodVO.type }}】</text>
+              </view>
+              <view class="flex-row items-center mt-52">
+                <image
+                  class="image_7"
+                  src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FjIVFaWXA-rmb.png"
+                />
+                <text class="font_4 ml-2">{{ item.cartGoodVO.price }}</text>
+                <!-- <text class="font_6 text_27 ml-2">00</text> -->
+              </view>
+            </view>
+          </view>
+          <view class="flex-row shrink-0 ml-21">
+            <image
+              class="image_5"
+              src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJYaNIhRB-short.png"
+							@click="shortNum(index)"
+            />
+            <view class="flex-col justify-start items-center text-wrapper ml-2"><text class="font_5">{{ item.quantity }}</text></view>
+            <image
+              class="image_6 ml-2"
+              src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXbkFIxCw-add.png"
+							@click="addNum(index)"
+            />
+          </view>
+        </view>
+      </view>
+      <view class="flex-row items-center self-center mt-48" style="margin-top: 56rpx;">
+        <view class="group_9">
+          <text class="font_2 text_12">注：购买商品均视为同意</text>
+          <text class="font_2 text_13">用户须知</text>
+        </view>
+        <image
+          class="shrink-0 image_8 ml-2"
+          src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXjPffNQe-question.png"
+        />
+      </view>
+    </view>
+    <view class="flex-col section_5">
+      <view class="flex-row justify-between items-center group_14">
+        <view class="flex-row">
+          <text class="font_7 text_14">商品总价</text>
+          <text class="font_8 ml-7">共{{ productArr.length }}件商品</text>
+        </view>
+        <view class="flex-row items-center">
+          <image
+            class="shrink-0 image_9"
+            src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FjIVFaWXA-rmb.png"
+          />
+          <text class="font_9">{{ sumprice }}</text>
+        </view>
+      </view>
+      <view class="flex-col mt-25">
+        <view class="flex-row justify-between group_10">
+          <text class="font_7">优惠券</text>
+          <view class="flex-row">
+            <text class="font_8">0张优惠券可用</text>
+            <image
+              class="shrink-0 image_7 ml-3"
+              src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FTrywtERT-right.png"
+            />
+          </view>
+        </view>
+        <view class="flex-col mt-9">
+          <view class="flex-row justify-between items-center group_11">
+            <text class="font_7 text_15">满120减0优惠</text>
+            <view class="flex-row items-center">
+              <image
+                class="shrink-0 image_9 image_10"
+                src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJmxvlQvD-rmbpink.png"
+              />
+              <text class="font_3 text_16">减</text>
+              <text class="font_9 text_17">0.00</text>
+            </view>
+          </view>
+          <view class="flex-row justify-between items-center group_12">
+            <text class="font_7 text_18">合计</text>
+            <view class="flex-row items-center">
+              <image
+                class="shrink-0 image_9"
+                src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FjIVFaWXA-rmb.png"
+              />
+              <text class="font_9">{{ sumprice }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="flex-col section_6">
+      <text class="self-start font_7 text_19">订单备注</text>
+      <view class="flex-col justify-start items-start self-stretch text-wrapper_2 mt-11">
+        <text class="font_2 text_20">备注建议提前协商（250字以内）</text>
+      </view>
+    </view>
+  </view>
+  <view class="flex-row justify-between items-center section_7 pos_8">
+    <view class="flex-row items-center">
+      <image
+        class="shrink-0 image_9 image_11"
+        src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJmxvlQvD-rmbpink.png"
+      />
+      <text class="text_21">应付：</text>
+      <text class="text_22">{{ sumprice }}</text>
+      <!-- <text class="text_24">00</text> -->
+    </view>
+    <view class="flex-col justify-start items-center text-wrapper_3" @click="createOrder"><text class="font_7 text_23">微信支付</text></view>
+  </view>
+</view>
 	<uni-popup ref="popup" background-color="#fff" @change="change">
 				<view class="popup-content">
 					<addressComponentVue></addressComponentVue>
@@ -170,7 +164,6 @@ import addressComponentVue from '../component/addressComponent.vue'; //导入组
 import { stateMap } from '../../../common/global';
 //一些暂时变量
 const num = ref(1)
-const price = ref(138)
 const youhuijuan_num = ref(1)
 const manjian = ref(120)
 const manjian1 = ref(50)
@@ -185,7 +178,8 @@ const labelList = ref([])  //老套路，商品标签
 const userInfo = wx.getStorageSync('userInfo')  //用户信息
 const orderItemList = ref({})
 const totalInfo = ref([]) //购物车传过来的批量商品
-const note = ref('')
+const note = ref('123')
+const postArr = ref([])
 onMounted(() => {
 	//将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗
 	emitter.on('close', () => {
@@ -241,24 +235,25 @@ const getDefaultAddress = async () =>{
 //创建待支付订单
 const createOrder = async () => {
 	console.log('地址信息-->',addressRealInfo.value);
+	formatArr()
+	console.log('postArr--->',postArr.value);
 	const resOrder = await uni.request({   //向后端发送生成订单请求
-		url: baseUrl + '/order/add',
+		url: baseUrl + '/order/add/cart',
 		method: 'POST',
 		header: {
 			cookie: wx.getStorageSync('cookie')
 		},
 		data: {
-			orderType: productArr.value[0].goodVO.isGoodType ? 'product' : 'service' ,
+			orderType: productArr.value[0].cartGoodVO.type === '服务类' ? 'service' : 'product',
 			userName: userInfo.userName,
 			addressId: addressRealInfo.value.id, //地址信息id
 			// contactsId: null, //联系人信息id
-			// couponId: null, //优惠卷id
-			totalAmount: sumprice.value, //实付价格
+			couponId: null, //优惠卷id
 			note: note.value,
-			orderItemMainInfoAddRequestList: toRaw(totalInfo.value)
+			cartOrderItemAddRequestList: toRaw(postArr.value)
 		}
 	})
-	console.log('后台返回订单响应==>',resOrder.data.data);
+	console.log('后台返回订单响应==>',resOrder.data);
 	if(resOrder.data.code === 1) {
 		wxPay(resOrder.data.data)
 	}
@@ -266,18 +261,19 @@ const createOrder = async () => {
 //根据商品id和购买数量获取商品信息
 const getProduct = async ()=> {
 	const res = await uni.request({
-		url: baseUrl + '/cart/cart/list',
+		url: baseUrl + '/cart/submit/list',
 		method: 'POST',
 		header: {
 			cookie: wx.getStorageSync('cookie')
 		},
 		data: JSON.stringify(totalInfo.value)
 	})
+	console.log('展示订单页面的商品信息-->',res.data);
 	if( res.data.code === 1 ) {
 		productArr.value = res.data.data
 		console.log('productArr--->',productArr.value);
 		productArr.value.forEach((item)=>{
-			sumprice.value += item.goodVO.price * item.quantity  //计算总金额
+			sumprice.value += item.cartGoodVO.price * item.quantity  //计算总金额
 		})
 	}
 }
@@ -286,17 +282,25 @@ const shortNum =(index)=>{
 	if(productArr.value[index].quantity > 1) {
 		productArr.value[index].quantity -= 1
 		//计算商品价格
-		sumprice.value -= productArr.value[index].goodVO.price * 1
+		sumprice.value -= productArr.value[index].cartGoodVO.price * 1
 	}
 }
 //增加当前商品数量
 const addNum =(index)=>{
-	 if( productArr.value[index].quantity < productArr.value[index].goodVO.inventory ) { //数量肯定不能大于库存
+	 if( productArr.value[index].quantity < productArr.value[index].cartGoodVO.inventory ) { //数量肯定不能大于库存
 		 productArr.value[index].quantity += 1
 		 //计算商品价格
-		 sumprice.value += productArr.value[index].goodVO.price * 1
+		 sumprice.value += productArr.value[index].cartGoodVO.price * 1
 	 }
 }
+const formatArr = () =>{
+	productArr.value.forEach((item,index)=>{
+		postArr.value.push({
+			cartRecordId: totalInfo.value[index],
+			quantity: item.quantity
+		})
+	})
+}
 const wxPay = async( oid )=> {  //传入订单id
 	try {
 		const res = await uni.request({
@@ -320,17 +324,20 @@ const wxPay = async( oid )=> {  //传入订单id
 					content: '支付成功',
 					showCancel: false
 				})
-				uni.navigateTo({
-					url: '/pages/order/product-paysuccess/product-paysuccess'
+				uni.redirectTo({
+					url: '/pages/order/product-paysuccess/product-paysuccess?oid=' + JSON.stringify(oid)
 				})
-				console.log(res);
+				console.log('支付成功res--->',res);
 			},
 			fail(e) {
 				uni.showModal({
 					content: '支付失败，原因为:' + e.errMsg,
 					showCancel: false
 				})
-				console.log(e.errMsg);
+				uni.redirectTo({
+					url: '/pages/order/product-paysuccess/product-paysuccess?oid=' + JSON.stringify(oid)
+				})
+				console.log('e.errMsg--->',e.errMsg);
 			}
 		})
 	}catch(error) {
@@ -344,347 +351,304 @@ const wxPay = async( oid )=> {  //传入订单id
 </script>
 
 <style lang="scss" scoped>
-.popup-content { 
-	height: 392px;
-	align-items: center;
-	justify-content: center;
-	background-color: #fff;
-}
 .ml-17 {
   margin-left: 31.88rpx;
 }
+.ml-21 {
+  margin-left: 39.38rpx;
+}
 .ml-7 {
   margin-left: 13.13rpx;
 }
 .mt-25 {
   margin-top: 46.88rpx;
 }
+.ml-3 {
+  margin-left: 5.63rpx;
+}
 .mt-9 {
   margin-top: 16.88rpx;
 }
 .mt-11 {
   margin-top: 20.63rpx;
 }
-.mt-194 {
-  margin-top: 363.75rpx;
-}
 .page {
-  padding-bottom: 65.63rpx;
-  background-color: #fffaf0;
+  background-color: #f8e8c1;
+  background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FQfLHXSAU-feiyigongfangbeijin.png');
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
   width: 100%;
   overflow-y: auto;
   overflow-x: hidden;
-  // height: 100vh;
-  overflow: hidden;
+  height: 100vh;
 }
-.group {
-  padding: 16.88rpx 15rpx 0 16.88rpx;
-	overflow-y: auto;
+.group_1 {
+  padding: 18.75rpx 15rpx 247.5rpx 16.88rpx;
 }
-.section {
-  padding: 20.81rpx 13.26rpx 15.07rpx 18.62rpx;
-  background-color: #fffef8;
+.section_2 {
+  padding: 21.07rpx 18.75rpx 18.51rpx 20.63rpx;
+  background-color: #ffffff;
   border-radius: 18.75rpx;
-  border: solid 1.88rpx #818181;
 }
 .font {
   font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 24.43rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 25.54rpx;
   color: #323232;
 }
 .text {
-  line-height: 24.39rpx;
+	margin-left: 54rpx;
+  line-height: 25.74rpx;
 }
-.image_2 {
+.image {
   width: 43.13rpx;
   height: 43.13rpx;
 }
 .font_2 {
   font-size: 22.5rpx;
-  font-family: Open Sans;
-  line-height: 22.16rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 22.54rpx;
   color: #818181;
 }
 .text_2 {
-  line-height: 20.83rpx;
+  line-height: 22.07rpx;
 }
-.group_2 {
-  margin-right: 3.77rpx;
-  margin-top: 35.31rpx;
-  width: 130.05rpx;
-}
-.image_3 {
-  margin-left: 105.67rpx;
-  width: 24.38rpx;
-  height: 24.38rpx;
+.group {
+  margin-top: 36.54rpx;
 }
 .font_3 {
   font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 24.43rpx;
-  color: #fb8b05;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 25.54rpx;
+  color: #ffaaa5;
 }
 .text_3 {
-  margin-left: -130.05rpx;
-  line-height: 24.23rpx;
+  line-height: 24.41rpx;
 }
-.group_3 {
-  padding: 0 58.2rpx;
+.image_2 {
+  width: 24.38rpx;
+  height: 24.38rpx;
+}
+.group_2 {
+  padding: 0 59.23rpx;
 }
 .text_4 {
   color: #5a5a5a;
-  line-height: 20.38rpx;
+  line-height: 19.42rpx;
 }
 .text_5 {
-  line-height: 16.54rpx;
+	margin-left: 24rpx;
+  line-height: 15.04rpx;
 }
-.section_2 {
-  padding: 20.49rpx 18.64rpx 18.88rpx 22.37rpx;
-  background-color: #fffef8;
+.section_3 {
+  margin-top: 16.88rpx;
+  padding: 22.5rpx 0 35.63rpx;
+  background-color: #ffffff;
   border-radius: 18.75rpx;
-  border: solid 1.88rpx #818181;
 }
-.image_4 {
+.group_18 {
+  padding-left: 26.27rpx;
+  padding-right: 24.36rpx;
+	margin-bottom: 20rpx;
+}
+.group_19 {
+  margin-bottom: 3.75rpx;
+}
+.image_3 {
   border-radius: 9.38rpx;
   width: 146.25rpx;
   height: 165rpx;
 }
-.group_4 {
-  margin-top: 4.07rpx;
+.image_4 {
+  margin-bottom: 9.38rpx;
 }
-.text_6 {
-  margin-left: 2.1rpx;
-  line-height: 20.79rpx;
-}
-.text-wrapper {
-  padding: 9.22rpx 0 7.56rpx;
-  background-color: #ffad4a78;
-  border-radius: 5.63rpx;
-  width: 84.38rpx;
-  height: 37.5rpx;
-}
-.text_7 {
-  line-height: 20.72rpx;
-}
-.text-wrapper_2 {
-  padding: 9.07rpx 0 7.59rpx;
-  background-color: #ffad4a78;
-  border-radius: 5.63rpx;
-  width: 121.88rpx;
-  height: 37.5rpx;
-}
-.text_8 {
-  line-height: 20.83rpx;
-}
-.text-wrapper_3 {
-  padding: 9.22rpx 0 7.56rpx;
-  background-color: #ffad4a78;
-  border-radius: 5.63rpx;
-  width: 114.38rpx;
-  height: 37.5rpx;
-}
-.text_9 {
-  line-height: 20.72rpx;
-}
-.group_5 {
-  margin-top: 15rpx;
-  padding: 0 5.87rpx;
-}
-.group_6 {
-  margin-left: 172.26rpx;
-}
-.text_10 {
-  margin-left: 25.03rpx;
-  color: #323232;
-  font-size: 33.75rpx;
-  font-family: Open Sans;
-  font-weight: 600;
-  line-height: 24.88rpx;
+.text_1 {
+  line-height: 25.01rpx;
 }
 .image_7 {
   width: 30rpx;
   height: 30rpx;
 }
-.image_8 {
-  margin-left: -90.66rpx;
+.font_4 {
+  font-size: 33.75rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 22.54rpx;
+  color: #323232;
 }
-.text_11 {
-  // margin-left: 61.14rpx;
-  font-weight: 600;
-  line-height: 19.29rpx;
+.font_6 {
+  font-size: 26.25rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 17.23rpx;
+  color: #323232;
+}
+.text_27 {
+  line-height: 17.53rpx;
 }
 .image_5 {
   border-radius: 9.38rpx 0rpx 0rpx 9.38rpx;
   width: 45rpx;
   height: 45rpx;
 }
-.text-wrapper_4 {
-  padding: 12.39rpx 0 13.88rpx;
-  background-color: #fbf8dc;
+.text-wrapper {
+  padding: 16.31rpx 0 16.46rpx;
+  background-color: #ffaaa5;
   width: 58.13rpx;
   height: 45rpx;
 }
-.text_12 {
-  line-height: 18.73rpx;
+.font_5 {
+  font-size: 26.25rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 17.23rpx;
+  color: #ffffff;
 }
 .image_6 {
   border-radius: 0rpx 9.38rpx 9.38rpx 0rpx;
   width: 45rpx;
   height: 45rpx;
 }
-.group_7 {
-  margin-top: 30rpx;
-  padding: 0 125.87rpx;
+.group_9 {
+  line-height: 21.71rpx;
+  height: 21.71rpx;
 }
-.group_8 {
-  line-height: 20.94rpx;
-  height: 20.94rpx;
+.text_12 {
+  line-height: 21.71rpx;
 }
 .text_13 {
-  line-height: 20.79rpx;
-}
-.text_14 {
   color: #ed4845;
-  line-height: 20.94rpx;
+  line-height: 21rpx;
 }
-.image_9 {
+.image_8 {
   width: 26.25rpx;
   height: 26.25rpx;
 }
-.section_3 {
-  padding: 29.87rpx 7.39rpx 3.88rpx 11.12rpx;
-  background-color: #fffef8;
+.section_5 {
+  margin-top: 16.88rpx;
+  padding: 31.88rpx 13.13rpx 5.63rpx;
+  background-color: #ffffff;
   border-radius: 18.75rpx;
-  border: solid 1.88rpx #818181;
 }
-.group_9 {
-  padding-left: 24.54rpx;
-  padding-right: 12.52rpx;
-}
-.font_4 {
-  font-size: 30rpx;
-  font-family: Open Sans;
-  line-height: 27.69rpx;
-  color: #323232;
-}
-.text_15 {
-  line-height: 27.84rpx;
-}
-.font_5 {
-  font-size: 30rpx;
-  font-family: Open Sans;
-  line-height: 27.69rpx;
-  color: #818181;
-}
-.text_16 {
-  line-height: 27.6rpx;
-}
-.image_10 {
-  width: 33.75rpx;
-  height: 33.75rpx;
-}
-.font_6 {
-  font-size: 30rpx;
-  font-family: Open Sans;
-  line-height: 22.16rpx;
-  color: #323232;
-}
-.group_10 {
-  padding-left: 23.59rpx;
-  padding-right: 7.74rpx;
-}
-.text_17 {
-  line-height: 27.71rpx;
-}
-.group_11 {
-  width: 227.91rpx;
-}
-.image_11 {
-  margin-left: 197.91rpx;
-}
-.text_18 {
-  margin-left: -227.91rpx;
-  line-height: 27.81rpx;
-}
-.group_12 {
-  padding: 26.25rpx 15.19rpx 28.13rpx 23.74rpx;
-  border-bottom: solid 1.88rpx #dfdfdf;
-}
-.text_19 {
-  line-height: 27.64rpx;
-}
-.image_12 {
-  margin-left: 23.44rpx;
-}
-.text_20 {
-  margin-left: -57.19rpx;
-  line-height: 24.17rpx;
-}
-.text_21 {
-  margin-left: 27.24rpx;
-  color: #fb8b05;
-}
-.group_13 {
-  padding: 26.25rpx 13.73rpx 28.13rpx 23.49rpx;
-}
-.text_22 {
-  line-height: 27.54rpx;
-}
-.section_1 {
-  padding: 17.74rpx 21.99rpx 20.76rpx;
-  background-color: #fffef8;
-  border-radius: 18.75rpx;
-  border: solid 1.88rpx #818181;
+.group_14 {
+  padding: 0 24.02rpx;
 }
 .font_7 {
   font-size: 30rpx;
-  font-family: Open Sans;
-  line-height: 27.69rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 29.18rpx;
+  color: #323232;
+}
+.text_14 {
+  line-height: 28.13rpx;
+}
+.font_8 {
+  font-size: 30rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 29.18rpx;
+  color: #818181;
+}
+.image_9 {
+  width: 33.75rpx;
+  height: 33.75rpx;
+}
+.font_9 {
+  font-size: 30rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 20.04rpx;
+  color: #323232;
+}
+.group_10 {
+  padding-left: 22.97rpx;
+  padding-right: 3.75rpx;
+}
+.group_11 {
+  padding: 26.25rpx 10.42rpx 28.13rpx 24.62rpx;
+  border-bottom: solid 1.88rpx #dfdfdf;
+}
+.text_15 {
+  line-height: 29.42rpx;
+}
+.image_10 {
+  margin-left: 21.6rpx;
+}
+.text_16 {
+  margin-left: -55.35rpx;
+  line-height: 25.74rpx;
+}
+.text_17 {
+  margin-left: 33.68rpx;
+  color: #ffaaa5;
+}
+.group_12 {
+  padding: 26.25rpx 11.94rpx 28.13rpx 23.44rpx;
+}
+.text_18 {
+  line-height: 27.77rpx;
+}
+.section_6 {
+  margin-top: 16.88rpx;
+  padding: 17.81rpx 24.13rpx 22.5rpx;
+  background-color: #ffffff;
+  border-radius: 18.75rpx;
+}
+.text_19 {
   color: #000000;
+  line-height: 29.53rpx;
 }
-.text-wrapper_5 {
-  align-self: stretch;
-  margin-left: 4.13rpx;
-  margin-right: 4.39rpx;
+.text-wrapper_2 {
+  margin-left: 3.99rpx;
+  margin-right: 3.99rpx;
+  padding: 22.35rpx 0 115.22rpx;
+  background-color: #ffefef;
+  border-radius: 9.38rpx;
 }
-.section_4 {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  padding: 16.88rpx 25.46rpx 25rpx;
+.text_20 {
+  margin-left: 21.15rpx;
+  line-height: 21.81rpx;
+}
+.section_7 {
+  padding: 16.88rpx 25.31rpx 15rpx;
   background-color: #ffffff;
 }
-.image_13 {
-  margin-left: 85.16rpx;
+.pos_8 {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
 }
-.text_24 {
-  margin-left: -118.91rpx;
-  line-height: 28.05rpx;
+.image_11 {
+  margin-left: 85.31rpx;
 }
-.text_25 {
-  margin-left: 24.62rpx;
-  color: #fbb612;
+.text_21 {
+  margin-left: -119.06rpx;
+  color: #000000;
+  font-size: 30rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 26.49rpx;
+}
+.text_22 {
+  margin-left: 28.5rpx;
+  color: #ffaaa5;
   font-size: 37.5rpx;
   font-family: Open Sans;
   font-weight: 700;
   line-height: 27.62rpx;
 }
-.text_27 {
-  color: #fbb612;
+.text_24 {
+  color: #ffaaa5;
+  font-size: 30rpx;
+  font-family: Open Sans;
   font-weight: 700;
   line-height: 22.05rpx;
 }
-.text-wrapper_6 {
-  padding: 21.56rpx 0 21.99rpx;
-  background-color: #fbb612;
+.text-wrapper_3 {
+  padding: 20.51rpx 0 22.97rpx;
+  background-color: #ffaaa5;
   border-radius: 75rpx;
   width: 204.38rpx;
   height: 71.25rpx;
 }
-.text_26 {
+.text_23 {
   color: #ffffff;
+  line-height: 27.77rpx;
 }
 @import url(../../../common/css/global.css);
 </style>