合完了

api/request.ts

@@ -6,4 +6,4 @@ export const domain = 'https://www.carboner.cn:8888/api'
 export const myIp = 'http://8.130.119.119:9092/api'
 export const nwct = 'https://winning-mouse-internally.ngrok-free.app/api'
 export const suiUrl = ''
-export const baseUrl = Url
+export const baseUrl = domain

common/globalImagesUrl.js

@@ -12,3 +12,4 @@ export const loginUrl = publicPath + subPath + '/login'
 export const orderUrl = publicPath + subPath + '/order'
 export const storeHomeUrl = publicPath + subPath + '/store-home'
 export const mineUrl = publicPath + subPath + '/mine'
+export const clothesRentUrl = publicPath + subPath + '/clothesRent'

pages.json

@@ -262,6 +262,48 @@
 		{
 			"navigationBarTitleText" : ""
 		}
+	},
+	{
+		"path" : "pages/clothesRent/clotherRentOrderList/clotherRentOrderList",
+		"style" : 
+		{
+			"navigationBarTitleText" : ""
+		}
+	},
+	{
+		"path" : "pages/clothesRent/clothesRentSubmitOrder/clothesRentSubmitOrder",
+		"style" : 
+		{
+			"navigationBarTitleText" : ""
+		}
+	},
+	{
+		"path" : "pages/book/myPhotoProductsOrderDetail/myPhotoProductsOrderDetail",
+		"style" : 
+		{
+			"navigationBarTitleText" : ""
+		}
+	},
+	{
+		"path" : "pages/book/myPhotoProductDetail/myPhotoProductDetail",
+		"style" : 
+		{
+			"navigationBarTitleText" : ""
+		}
+	},
+	{
+		"path" : "pages/book/myPhotoProducts/myPhotoProducts",
+		"style" : 
+		{
+			"navigationBarTitleText" : ""
+		}
+	},
+	{
+		"path" : "pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail",
+		"style" : 
+		{
+			"navigationBarTitleText" : ""
+		}
 	}
 	],
 	"plugins" : {

pages/activity/activityMain/activityMain.vue

@@ -22,10 +22,16 @@
 	import { homeUrl } from '../../../common/globalImagesUrl';
 	import { baseUrl } from '../../../api/request';
 	import { publicPath } from '../../../common/globalImagesUrl';
+	import { getFZXZFont } from '../../../common/globalFont';
+	import { onLoad } from "@dcloudio/uni-app";
 	const bkgUrl =  ref(homeUrl + '/bkg.png')
 	const articleList = ref([])
 	const cookie = wx.getStorageSync('cookie')
 	
+	onLoad(() => {
+		getFZXZFont()
+	})
+	
 	onMounted(() => {
 		getArticle()
 	})

pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue

@@ -0,0 +1,354 @@
+<template>
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}">
+	  <view class="flex-row justify-between section_2 pos">
+		  
+		<view @click="isSelectedState(0)">
+		   <text class="font" :style="{ color: color[0] }">&ensp;全部&ensp;</text>
+		   <view class="flex-col justify-start items-center" v-if="isShowUnderLine[0]" style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view>
+		</view>
+		
+		<view @click="isSelectedState(1)">
+	      <text class="font" :style="{ color: color[1] }">待支付</text>
+		  <view class="flex-col justify-start items-center" v-if="isShowUnderLine[1]" style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view>
+		</view>
+		
+		<view @click="isSelectedState(2)">
+	      <text class="font" :style="{ color: color[2] }">待提货</text>
+		  <view class="flex-col justify-start items-center" v-if="isShowUnderLine[2]" style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view>
+		</view>
+
+		<view @click="isSelectedState(3)">
+			<text class="font" :style="{ color: color[3] }">租赁中</text>
+			<view class="flex-col justify-start items-center" v-if="isShowUnderLine[3]" style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view>
+		</view>
+		
+		<view @click="isSelectedState(4)">
+			<text class="font" :style="{ color: color[4] }">已完成</text>
+			<view class="flex-col justify-start items-center" v-if="isShowUnderLine[4]" style="border: 1.88rpx solid #e79ea1; width: 90rpx; margin-top: 10rpx;"></view>
+		</view>
+		
+	  </view>
+	  
+	  
+	  <view class="flex-col pos_2">
+	    <view class="flex-col list-item mt-15" v-for="(item, index) in items" :key="index">
+	      <view class="flex-row justify-between group">
+	        <text class="font_3">泠珑水月阁</text>
+	        <view class="flex-row items-center">
+	          <text class="font_4 text_2">00:45</text>
+	          <text class="ml-4 font_5 text_3">等待买家付款</text>
+	        </view>
+	      </view>
+	      <view class="flex-row items-center group view">
+	        <text class="font_6">订单编号：</text>
+	        <text class="font_7 text_4">E20241005095840091406189</text>
+	      </view>
+	      <view class="divider"></view>
+	      <view class="flex-row justify-between items-end group_2">
+	        <view class="flex-row">
+	          <image
+	            class="image"
+	            src="https://ide.code.fun/api/image?token=67dd57af4ae84d00122a84d1&name=4e1283e4d0bf9a8e9fe23602be4fa0f7.png"
+	          />
+	          <view class="flex-col items-start group_3 ml-13">
+	            <text class="font_8">汉服—曲裾系列</text>
+	            <text class="font_10 text_6 mt-59">￥138.00</text>
+	          </view>
+	        </view>
+	        <view class="flex-col items-center group_4">
+	          <image
+	            class="image_2"
+				:src="clothesRentUrl + '/clothesRentOrderList/bkg.png'"
+	          />
+	          <text class="font_9 text_5 mt-11">提货地址</text>
+	        </view>
+	      </view>
+	      <view class="flex-row justify-between items-baseline group view_2">
+	        <text class="font_6 text_7">租赁天数</text>
+	        <text class="font_11 text_8">X3</text>
+	      </view>
+	      <view class="flex-row justify-end items-baseline group_5">
+	        <text class="font_9 text_9">实付款：</text>
+	        <text class="font_12">￥138.00</text>
+	      </view>
+	      <view class="flex-row justify-center group_6">
+	        <view class="flex-col justify-start items-center text-wrapper">
+	          <text class="font_13 text_10">联系客服</text>
+	        </view>
+	        <view class="ml-10 flex-col justify-start items-center text-wrapper">
+	          <text class="font_13">取消订单</text>
+	        </view>
+	        <view class="ml-10 flex-col justify-start items-center text-wrapper_2">
+	          <text class="font_14 text_11">去付款</text>
+	        </view>
+	      </view>
+	    </view>
+	  </view>
+	</view>
+</template>
+
+<script setup>
+	import {ref} from 'vue'
+	import { clothesRentUrl } from '../../../common/globalImagesUrl';
+	const items = ref([null, null, null, null])
+	const isShowUnderLine = ref([true, false, false, false, false])
+	const color = ref(new Array(5).fill('#323232'))
+	const point = ref(0)
+	const bkgUrl = ref(clothesRentUrl + '/clothesRentOrderList/bkg.png')
+	
+	const isSelectedState = async (val) => {
+		if (point.value === val) return 
+		point.value = val
+		for (var i = 0; i < 5; i ++ ) {
+			if (i === val) {
+				isShowUnderLine.value[i] = true
+				color.value[i] = '#e79ea1'
+			} else {
+				isShowUnderLine.value[i] = false
+				color.value[i] = '#323232'
+			}
+		}
+		// await getMyOrder()
+		// if (point.value !== 0) {
+		// 	orderList.value = orderList.value.filter(item => item.orderStatus === orderStatusList[point.value])
+		// } 
+	}
+	
+</script>
+
+<style scoped lang="scss">
+.mt-15 {
+  margin-top: 28.13rpx;
+}
+.ml-13 {
+  margin-left: 24.38rpx;
+}
+.mt-59 {
+  margin-top: 110.63rpx;
+}
+.mt-11 {
+  margin-top: 20.63rpx;
+}
+.page {
+  background-color: #ffffff;
+  overflow: hidden;
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  width: 100%;
+  overflow-y: auto; 
+  overflow-x: hidden;
+  height: 100vh;
+}
+.section_2 {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20rpx 41.25rpx 0;
+  background-color: #ebe7e4;
+}
+.pos {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 9;
+}
+.font {
+  font-size: 30rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 28.24rpx;
+  color: #323232;
+}
+.font_2 {
+  font-size: 30rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 28.84rpx;
+  color: #323232;
+}
+.text {
+  line-height: 27.43rpx;
+}
+.pos_2 {
+  position: absolute;
+  left: 22.5rpx;
+  right: 24.38rpx;
+  top: 108.75rpx;
+  padding-bottom: 40rpx;
+}
+.list-item {
+  padding: 18.75rpx 15rpx 0;
+  background-color: #ffffff;
+  border-radius: 18.75rpx;
+}
+.list-item:first-child {
+  margin-top: 0;
+}
+.group {
+  padding: 0 11.25rpx;
+}
+.font_3 {
+  font-size: 30rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 28.01rpx;
+  color: #323232;
+}
+.font_4 {
+  font-size: 26.25rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 18.79rpx;
+  color: #ffaaa5;
+}
+.text_2 {
+  font-size: 28.13rpx;
+}
+.font_5 {
+  font-size: 26.25rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 25.84rpx;
+  color: #ffaaa5;
+}
+.text_3 {
+  line-height: 25.74rpx;
+}
+.view {
+  margin-top: 18.75rpx;
+}
+.font_6 {
+  font-size: 26.25rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 25.84rpx;
+  color: #818181;
+}
+.font_7 {
+  font-size: 26.25rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 18.79rpx;
+  color: #818181;
+}
+.text_4 {
+  line-height: 17.53rpx;
+}
+.divider {
+  margin-top: 18.75rpx;
+  background-color: #dbdbdb;
+  height: 1.88rpx;
+}
+.group_2 {
+  margin-top: 26.25rpx;
+  padding: 0 9.38rpx;
+  position: relative;
+}
+.image {
+  border-radius: 9.38rpx;
+  width: 148.13rpx;
+  height: 165rpx;
+}
+.group_3 {
+  margin-bottom: 3.75rpx;
+}
+.font_8 {
+  font-size: 30rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 29.18rpx;
+  color: #323232;
+}
+.font_10 {
+  font-size: 30rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 18.79rpx;
+  color: #323232;
+}
+.text_6 {
+  margin-left: 7.5rpx;
+  line-height: 20.04rpx;
+}
+.group_4 {
+  position: absolute;
+  top: 0;
+  right: 0rpx;
+}
+.image_2 {
+  width: 46.88rpx;
+  height: 46.88rpx;
+}
+.font_9 {
+  font-size: 26.25rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 25.84rpx;
+  color: #323232;
+}
+.text_5 {
+  line-height: 25.22rpx;
+}
+.view_2 {
+  margin-top: 22.5rpx;
+}
+.text_7 {
+  font-size: 28.13rpx;
+  line-height: 27.02rpx;
+}
+.font_11 {
+  font-size: 26.25rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 18.79rpx;
+  color: #323232;
+}
+.text_8 {
+  font-size: 28.13rpx;
+}
+.group_5 {
+  margin-top: 30rpx;
+}
+.text_9 {
+  font-size: 28.13rpx;
+  line-height: 26.7rpx;
+}
+.font_12 {
+  font-size: 33.75rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 22.54rpx;
+  color: #c35c5d;
+}
+.group_6 {
+  margin-top: 30rpx;
+  padding: 26.25rpx 0rpx 26.25rpx 180rpx;
+  border-top: solid 1.88rpx #dbdbdb;
+}
+.font_13 {
+  font-size: 26.25rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 25.84rpx;
+  color: #e79ea1;
+}
+.text_10 {
+  line-height: 25.54rpx;
+}
+.text-wrapper {
+  padding: 15rpx 0;
+  background-color: #ffffff;
+  border-radius: 75rpx;
+  width: 153.75rpx;
+  height: 56.25rpx;
+  border-left: solid 1.88rpx #e79ea1;
+  border-right: solid 1.88rpx #e79ea1;
+  border-top: solid 1.88rpx #e79ea1;
+  border-bottom: solid 1.88rpx #e79ea1;
+}
+.text-wrapper_2 {
+  padding: 15rpx 0;
+  background-color: #e79ea1;
+  border-radius: 75rpx;
+  width: 153.75rpx;
+  height: 56.25rpx;
+}
+.font_14 {
+  font-size: 26.25rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 25.84rpx;
+  color: #ffffff;
+}
+.text_11 {
+  line-height: 24rpx;
+}
+@import url(../../../common/css/global.css);
+</style>

pages/clothesRent/clothesRentOrderDetail/clothesRentOrderDetail.vue

@@ -0,0 +1,317 @@
+<template>
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}">
+	  <view class="flex-row items-center section_2 pos">
+	    <image
+	      class="image"
+	      :src="clothesRentUrl + '/clothesRentOrderDetail/dzf.png'"
+	    />
+	    <view class="ml-6 flex-col items-start flex-1">
+	      <text class="font text">等待买家付款</text>
+	      <text class="text_2 mt-3">请于13分51秒内付款，超时订单将自动关闭</text>
+	    </view>
+	  </view>
+	  <view class="flex-row items-center section_3 pos_2">
+	    <image
+	      class="image_2"
+	      :src="clothesRentUrl + '/clothesRentOrderDetail/lxr.png'"
+	    />
+	    <text class="font text_3 ml-9">张三 15888610253</text>
+	  </view>
+	  <view class="flex-col section_4 pos_3">
+	    <view class="flex-row justify-between group">
+	      <view class="flex-row">
+	        <image
+	          class="image_3"
+	          src="https://ide.code.fun/api/image?token=67dd8f7cdefdb1001119a623&name=0c34cbad13bda42b94fffa906d29960d.png"
+	        />
+	        <view class="ml-12 flex-col items-start group_2">
+	          <text class="font_2 text_4">汉服—曲裾系列</text>
+	          <text class="font_3 text_6 mt-59">￥138.00</text>
+	        </view>
+	      </view>
+	      <view class="flex-col items-center self-start">
+	        <image
+	          class="image_2"
+	          :src="clothesRentUrl + '/clothesRentOrderDetail/nav.png'"
+	        />
+	        <text class="font_2 text_5 mt-11">提货地址</text>
+	      </view>
+	    </view>
+	    <view class="mt-18 flex-col">
+	      <view class="flex-col group_3">
+	        <view class="flex-row justify-between items-baseline">
+	          <text class="font text_7">租赁天数</text>
+	          <text class="font_3 text_8">X3</text>
+	        </view>
+	        <view class="mt-14 flex-row justify-end items-baseline">
+	          <text class="font_2 text_9">实付款：</text>
+	          <text class="text_10">￥138.00</text>
+	        </view>
+	      </view>
+	      <view class="flex-col group_4">
+	        <view class="flex-col" style="position: relative;">
+	          <view class="flex-row justify-between items-baseline">
+	            <text class="font">创建时间：</text>
+	            <text class="font_4 text_11">2024-10-05 09:58:41</text>
+	          </view>
+	          <view class="flex-row mt-9">
+	            <text class="font text_12">订单编号：</text>
+	            <view class="flex-row items-center flex-1 group_5" style="position: absolute; right: 0;">
+	              <text class="font_4 text_13">E20241005095840091406189</text>
+	              <view class="ml-4 flex-col justify-start items-center shrink-0 text-wrapper">
+	                <text class="text_14">复制</text>
+	              </view>
+	            </view>
+	          </view>
+	        </view>
+	        <view class="flex-row justify-center items-center mt-19">
+	          <image
+	            class="image_4"
+	            :src="clothesRentUrl + '/clothesRentOrderDetail/lxkf.png'"
+	          />
+	          <text class="font_2 text_15">在线客服</text>
+	        </view>
+	      </view>
+	    </view>
+	  </view>
+	  <view class="flex-row justify-between items-center section_5 pos_4">
+	    <view class="flex-row items-baseline">
+	      <text class="font text_16">应付款：</text>
+	      <text class="text_17">￥138.00</text>
+	    </view>
+	    <view class="flex-col justify-start items-center text-wrapper_2"><text class="font text_18">去支付</text></view>
+	  </view>
+	</view>
+</template>
+
+<script setup>
+	import {ref} from 'vue'
+	import { clothesRentUrl } from '../../../common/globalImagesUrl';
+	const bkgUrl = ref(clothesRentUrl + '/clothesRentOrderDetail/bkg.png')
+</script>
+
+<style scoped lang="scss">
+.mt-3 {
+  margin-top: 5.63rpx;
+}
+.ml-9 {
+  margin-left: 16.88rpx;
+}
+.mt-59 {
+  margin-top: 110.63rpx;
+}
+.mt-11 {
+  margin-top: 20.63rpx;
+}
+.mt-9 {
+  margin-top: 16.88rpx;
+}
+.mt-19 {
+  margin-top: 35.63rpx;
+}
+.page {
+  background-color: #ffffff;
+  overflow: hidden;
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  width: 100%;
+  overflow-y: auto;
+  overflow-x: hidden;
+  height: 100vh;
+}
+.section_2 {
+  padding: 16.88rpx 20.63rpx;
+  background-color: #ffffff;
+  border-radius: 18.75rpx;
+}
+.pos {
+  position: absolute;
+  left: 22.5rpx;
+  right: 24.38rpx;
+  top: 31.88rpx;
+}
+.image {
+  width: 75rpx;
+  height: 75rpx;
+}
+.font {
+  font-size: 28.13rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 26.47rpx;
+  color: #818181;
+}
+.text {
+  color: #323233;
+  line-height: 27.58rpx;
+}
+.text_2 {
+  color: #6b6e72;
+  font-size: 24.38rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 24rpx;
+}
+.section_3 {
+  padding: 26.25rpx 30rpx;
+  background-color: #ffffff;
+  border-radius: 18.75rpx;
+}
+.pos_2 {
+  position: absolute;
+  left: 22.5rpx;
+  right: 24.38rpx;
+  top: 165rpx;
+}
+.image_2 {
+  width: 46.88rpx;
+  height: 46.88rpx;
+}
+.text_3 {
+  font-size: 30rpx;
+  line-height: 25.89rpx;
+}
+.section_4 {
+  padding: 30rpx 11.25rpx 30rpx 16.88rpx;
+  background-color: #ffffff;
+  border-radius: 18.75rpx;
+}
+.pos_3 {
+  position: absolute;
+  left: 24.38rpx;
+  right: 24.38rpx;
+  top: 285rpx;
+}
+.group {
+  padding: 0 15rpx;
+}
+.image_3 {
+  border-radius: 9.38rpx;
+  width: 148.13rpx;
+  height: 165rpx;
+}
+.group_2 {
+  margin-bottom: 3.75rpx;
+}
+.font_2 {
+  font-size: 28.13rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 26.47rpx;
+  color: #323232;
+}
+.text_4 {
+  font-size: 30rpx;
+  line-height: 29.18rpx;
+}
+.font_3 {
+  font-size: 28.13rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 19.41rpx;
+  color: #323232;
+}
+.text_6 {
+  margin-left: 11.25rpx;
+  font-size: 30rpx;
+  line-height: 20.04rpx;
+}
+.text_5 {
+  font-size: 26.25rpx;
+  line-height: 25.22rpx;
+}
+.group_3 {
+  padding-left: 15rpx;
+  padding-bottom: 26.25rpx;
+  border-bottom: solid 2.81rpx #dbdbdb;
+}
+.text_7 {
+  line-height: 27.02rpx;
+}
+.text_8 {
+  margin-right: 22.5rpx;
+  line-height: 18.79rpx;
+}
+.text_9 {
+  line-height: 26.7rpx;
+}
+.text_10 {
+  color: #c35c5d;
+  font-size: 33.75rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 22.54rpx;
+}
+.group_4 {
+  padding: 33.75rpx 15rpx 0;
+}
+.font_4 {
+  font-size: 28.13rpx;
+  font-family: Open Sans;
+  line-height: 19.41rpx;
+  color: #323232;
+}
+.text_11 {
+  font-size: 26.25rpx;
+}
+.text_12 {
+  line-height: 27.69rpx;
+}
+.group_5 {
+  margin-right: 7.5rpx;
+}
+.text_13 {
+  font-size: 26.25rpx;
+  line-height: 19.29rpx;
+}
+.text-wrapper {
+  background-color: #ffffff;
+  width: 65.63rpx;
+  height: 30rpx;
+  border: solid 0.94rpx #d1d1dd;
+}
+.text_14 {
+  color: #323232;
+  font-size: 22.5rpx;
+  font-family: Open Sans;
+  line-height: 20.83rpx;
+}
+.image_4 {
+  width: 45rpx;
+  height: 45rpx;
+}
+.text_15 {
+  font-size: 30rpx;
+  line-height: 28.48rpx;
+}
+.section_5 {
+  padding: 15rpx 15rpx 15rpx 22.5rpx;
+  background-color: #ffffff;
+}
+.pos_4 {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+}
+.text_16 {
+  color: #000000;
+  font-size: 30rpx;
+  line-height: 27.43rpx;
+}
+.text_17 {
+  color: #c35c5d;
+  font-size: 33.75rpx;
+  font-family: Open Sans;
+  line-height: 24.96rpx;
+}
+.text-wrapper_2 {
+  padding: 22.5rpx 0;
+  background-color: #e79ea1;
+  border-radius: 75rpx;
+  width: 204.38rpx;
+  height: 71.25rpx;
+}
+.text_18 {
+  color: #ffffff;
+  font-size: 30rpx;
+  line-height: 27.77rpx;
+}
+@import url(../../../common/css/global.css);
+</style>
+ 

pages/clothesRent/clothesRentSubmitOrder/clothesRentSubmitOrder.vue

@@ -0,0 +1,211 @@
+<template>
+	<view class="flex-col justify-start relative page" :style="{ backgroundImage: 'url(' + bkgUrl + ')'}">
+	  <view class="flex-row justify-between items-center section_2 pos">
+	    <view class="flex-row items-center">
+	      <image
+	        class="shrink-0 image"
+	        :src="clothesRentUrl + '/clotesRentSubmitOrder/dzf.png'"
+	      />
+	      <text class="ml-10 font text">张三 15888610253</text>
+	    </view>
+	    <view class="flex-row">
+	      <text class="font_2 text_2">更换联系人</text>
+	      <image
+	        class="ml-2 shrink-0 image_2"
+	        :src="clothesRentUrl + '/clotesRentSubmitOrder/yjt.png'"
+	      />
+	    </view>
+	  </view>
+	  <view class="flex-col section_3 pos_2">
+	    <view class="flex-row justify-between">
+	      <view class="flex-row">
+	        <image
+	          class="image_3"
+	          src="https://ide.code.fun/api/image?token=67dd57af4ae84d00122a84d1&name=9e6e4f59936d62d5d7cfd08e1612a1d7.png"
+	        />
+	        <view class="flex-col items-start group_2 ml-15">
+	          <text class="font text_3">汉服—曲裾系列</text>
+	          <text class="mt-64 font_3">￥129.00</text>
+	        </view>
+	      </view>
+	      <view class="flex-col items-center self-start group">
+	        <image
+	          class="image_4"
+	          :src="clothesRentUrl + '/clotesRentSubmitOrder/nav.png'"
+	        />
+	        <text class="font_2 text_4 mt-11">提货地址</text>
+	      </view>
+	    </view>
+	    <view class="flex-row justify-between items-baseline group_3">
+	      <text class="font">租赁天数</text>
+	      <text class="font_3 text_5">X3</text>
+	    </view>
+	    <view class="flex-row justify-between items-baseline group_4">
+	      <text class="font text_6">总计</text>
+	      <text class="text_7">￥129.00</text>
+	    </view>
+	  </view>
+	  <view class="flex-row justify-between items-center section_4 pos_3">
+	    <view class="flex-row items-baseline">
+	      <text class="font_4 text_8">定金：</text>
+	      <text class="font_4 text_9">￥129.00</text>
+	    </view>
+	    <view class="flex-col justify-start items-center text-wrapper"><text class="font text_10">确定</text></view>
+	  </view>
+	</view>
+</template>
+
+<script setup>
+	import {ref} from 'vue'
+	import { clothesRentUrl } from '../../../common/globalImagesUrl';
+	const bkgUrl = ref(clothesRentUrl + '/clothesRentSubmitOrder/bkg.png')
+</script>
+
+<style scoped lang="scss">
+.ml-15 {
+  margin-left: 28.13rpx;
+}
+.mt-11 {
+  margin-top: 20.63rpx;
+}
+.page {
+  background-color: #ffffff;
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  width: 100%;
+  overflow-y: auto;
+  overflow-x: hidden;
+  height: 100vh;
+}
+.section_2 {
+  padding: 30rpx 15rpx 30rpx 24.38rpx;
+  background-color: #ffffff;
+  border-radius: 18.75rpx;
+}
+.pos {
+  position: absolute;
+  left: 22.5rpx;
+  right: 24.38rpx;
+  top: 37.5rpx;
+}
+.image {
+  width: 50.63rpx;
+  height: 50.63rpx;
+}
+.font {
+  font-size: 30rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 28.84rpx;
+  color: #323232;
+}
+.text {
+  color: #818181;
+  line-height: 25.89rpx;
+}
+.font_2 {
+  font-size: 26.25rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 25.54rpx;
+}
+.text_2 {
+  margin: 3.75rpx 0;
+  color: #e79ea1;
+}
+.image_2 {
+  width: 30rpx;
+  height: 30rpx;
+}
+.section_3 {
+  padding: 18.75rpx 18.75rpx 41.25rpx 18.75rpx;
+  background-color: #ffffff;
+  border-radius: 18.75rpx;
+}
+.pos_2 {
+  position: absolute;
+  left: 22.5rpx;
+  right: 24.38rpx;
+  top: 168.75rpx;
+}
+.image_3 {
+  border-radius: 9.38rpx;
+  width: 161.25rpx;
+  height: 176.25rpx;
+}
+.group_2 {
+  margin-top: 3.75rpx;
+}
+.text_3 {
+  line-height: 29.18rpx;
+}
+.font_3 {
+  font-size: 30rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 20.04rpx;
+  color: #323232;
+}
+.group {
+  // margin-right: 22.5rpx;
+}
+.image_4 {
+  width: 46.88rpx;
+  height: 46.88rpx;
+}
+.text_4 {
+  color: #323232;
+  line-height: 25.22rpx;
+}
+.group_3 {
+  margin-top: 37.5rpx;
+}
+.text_5 {
+  margin-right: 18.75rpx;
+}
+.group_4 {
+  margin-top: 22.5rpx;
+}
+.text_6 {
+  line-height: 28.13rpx;
+}
+.text_7 {
+  color: #c35c5d;
+  font-size: 33.75rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 22.54rpx;
+}
+.section_4 {
+  padding: 26.25rpx;
+  background-color: #ffffff;
+}
+.pos_3 {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
+.font_4 {
+  font-size: 37.5rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+}
+.text_8 {
+  color: #323232;
+  line-height: 34.42rpx;
+}
+.text_9 {
+  margin-left: -7.5rpx;
+  color: #c35c5d;
+  line-height: 25.05rpx;
+}
+.text-wrapper {
+  margin-right: 3.75rpx;
+  padding: 22.5rpx 0;
+  background-color: #e79ea1;
+  border-radius: 187.5rpx;
+  width: 241.88rpx;
+  height: 76.88rpx;
+}
+.text_10 {
+  color: #ffffff;
+  line-height: 28.01rpx;
+}
+@import url(../../../common/css/global.css);
+</style>

pages/clothesRent/component/clothesAttribute.vue

@@ -0,0 +1,192 @@
+<template>
+	<view class="flex-col page">
+	  <view class="flex-row justify-between group">
+	    <text class="font text">请选择租赁天数</text>
+	    <image
+	      class="image"
+	      :src="clothesRentUrl + '/component/cha.png'"
+	    />
+	  </view>
+	  <view class="flex-row items-center group view">
+	    <image
+	      class="image_2"
+	      src="https://ide.code.fun/api/image?token=67dd57af4ae84d00122a84d1&name=ef8fd08c2a91d3833c648cd64691f68d.png"
+	    />
+	    <view class="flex-col items-start flex-1 ml-13">
+	      <text class="font_2 text_2">淡雅古风衣淡雅古风衣淡雅古风衣淡</text>
+	      <text class="mt-48 font_2 text_3">￥129.00</text>
+	    </view>
+	  </view>
+	  <view class="flex-row justify-between items-center group_2 view_2">
+	    <text class="font">租赁天数</text>
+	    <view class="flex-row">
+	      <view class="flex-col justify-start items-center image-wrapper">
+	        <image
+	          class="image_3"
+	          :src="clothesRentUrl + '/component/sub.png'"
+	        />
+	      </view>
+	      <view class="ml-2 flex-col justify-start items-center text-wrapper"><text class="text_4">2</text></view>
+	      <view class="ml-2 flex-col justify-start items-center image-wrapper_2">
+	        <image
+	          class="image_3"
+	          :src="clothesRentUrl + '/component/add.png'"
+	        />
+	      </view>
+	    </view>
+	  </view>
+	  <view class="divider"></view>
+	  <view class="flex-row justify-between items-start group_2 view_3">
+	    <view class="flex-col justify-start items-start relative group_3">
+	      <view class="group_4"></view>
+	      <text class="font text_5 pos">定金：</text>
+	      <text class="font text_6 pos_2">￥129.00</text>
+	    </view>
+	    <view class="flex-col justify-start items-center text-wrapper_2"><text class="text_7">确定</text></view>
+	  </view>
+	</view>
+</template>
+
+<script setup>
+	import {ref} from 'vue' 
+	import { clothesRentUrl } from '../../../common/globalImagesUrl';
+	
+</script>
+
+<style scoped lang="scss">
+	
+	.ml-13 {
+	  margin-left: 24.38rpx;
+	}
+	.page {
+	  padding-top: 31.88rpx;
+	  background-color: #ffffff;
+	  width: 100%;
+	  overflow-y: auto;
+	  overflow-x: hidden;
+	  height: 100%;
+	}
+	.group {
+	  padding: 0 22.5rpx;
+	}
+	.font {
+	  font-size: 37.5rpx;
+	  font-family: FZSongKeBenXiuKaiS-R-GB;
+	  line-height: 36.04rpx;
+	  color: #323232;
+	}
+	.text {
+	  margin: 3.75rpx 0;
+	  line-height: 36.34rpx;
+	}
+	.image {
+	  width: 52.5rpx;
+	  height: 41.25rpx;
+	}
+	.view {
+	  margin-top: 35.63rpx;
+	}
+	.image_2 {
+	  border-radius: 18.75rpx;
+	  width: 198.75rpx;
+	  height: 200.63rpx;
+	}
+	.font_2 {
+	  font-size: 33.75rpx;
+	  font-family: FZSongKeBenXiuKaiS-R-GB;
+	  color: #323232;
+	}
+	.text_2 {
+	  line-height: 41.25rpx;
+	  width: 369.38rpx;
+	}
+	.text_3 {
+	  margin-left: 7.5rpx;
+	  line-height: 22.54rpx;
+	}
+	.group_2 {
+	  padding: 0 26.25rpx;
+	}
+	.view_2 {
+	  margin-top: 60rpx;
+	}
+	.image-wrapper {
+	  padding: 11.25rpx 0;
+	  background-color: #fbdedf;
+	  border-radius: 9.38rpx 0rpx 0rpx 9.38rpx;
+	  width: 48.06rpx;
+	  height: 51.04rpx;
+	}
+	.image_3 {
+	  width: 28.13rpx;
+	  height: 30rpx;
+	}
+	.text-wrapper {
+	  padding: 18.25rpx 0 18.75rpx;
+	  background-color: #fbdedf;
+	  width: 62.06rpx;
+	  height: 51.04rpx;
+	}
+	.text_4 {
+	  color: #323232b3;
+	  font-size: 26.25rpx;
+	  font-family: Open Sans;
+	  line-height: 19.01rpx;
+	}
+	.image-wrapper_2 {
+	  padding: 11.25rpx 0;
+	  background-color: #fbdedf;
+	  border-radius: 0rpx 9.38rpx 9.38rpx 0rpx;
+	  width: 48.06rpx;
+	  height: 51.04rpx;
+	}
+	.divider {
+	  margin-top: 30rpx;
+	  background-color: #0000001f;
+	  height: 1.88rpx;
+	}
+	.view_3 {
+	  margin-top: 37.5rpx;
+	}
+	.group_3 {
+	  margin-top: 18.75rpx;
+	  width: 254.23rpx;
+	}
+	.group_4 {
+	  margin-left: 22.5rpx;
+	  border-radius: 9.38rpx 9.38rpx 0 0;
+	  width: 123.75rpx;
+	  height: 89.06rpx;
+	}
+	.text_5 {
+	  line-height: 34.42rpx;
+	}
+	.pos {
+	  position: absolute;
+	  left: 0;
+	  top: 2.46rpx;
+	}
+	.text_6 {
+	  color: #c35c5d;
+	  line-height: 25.05rpx;
+	}
+	.pos_2 {
+	  position: absolute;
+	  right: 0;
+	  top: 9.17rpx;
+	}
+	.text-wrapper_2 {
+	  padding: 22.5rpx 0;
+	  background-color: #e79ea1;
+	  border-radius: 187.5rpx;
+	  width: 241.88rpx;
+	  height: 76.88rpx;
+	}
+	.text_7 {
+	  color: #ffffff;
+	  font-size: 30rpx;
+	  font-family: FZSongKeBenXiuKaiS-R-GB;
+	  line-height: 28.01rpx;
+	}
+	@import url(../../../common/css/global.css);
+</style>

pages/clothesRent/component/clothesAttributePlus.vue

@@ -0,0 +1,244 @@
+<template>
+	<view class="flex-col page">
+	  <view class="flex-col group">
+	    <view class="flex-row justify-between self-stretch">
+	      <text class="font text">请选择产品规格</text>
+	      <image
+	        class="image"
+	        :src="clothesRentUrl + '/component/cha.png'"
+	      />
+	    </view>
+	    <view class="flex-row self-stretch group_2">
+	      <image
+	        class="shrink-0 image_2"
+	        src="https://ide.code.fun/api/image?token=67dd8f7cdefdb1001119a623&name=ef8fd08c2a91d3833c648cd64691f68d.png"
+	      />
+	      <view class="flex-col shrink-0 group_3 ml-13">
+	        <text class="self-stretch font_2 text_2">淡雅古风衣淡雅古风衣淡雅古风衣淡</text>
+	        <text class="mt-48 self-start font_2 text_3">￥129.00</text>
+	      </view>
+	    </view>
+	    <view class="flex-col self-stretch">
+	      <view class="flex-col justify-start items-start relative">
+	        <view class="group_4"></view>
+	        <text class="font_2 text_4 pos">妆造服务</text>
+	      </view>
+	      <view class="flex-row">
+	        <view class="flex-col justify-start items-center text-wrapper">
+	          <text class="font_3 text_5">本店上妆</text>
+	        </view>
+	        <view class="flex-col justify-start items-center text-wrapper ml-17">
+	          <text class="font_3 text_6">无需妆造</text>
+	        </view>
+	      </view>
+	    </view>
+	    <text class="self-start font_2 text_7">拍摄场地</text>
+	    <view class="flex-row equal-division">
+	      <view class="flex-col section equal-division-item">
+	        <view class="flex-row justify-between items-end self-stretch">
+	          <image
+	            class="image_3"
+	            :src="clothesRentUrl + '/component/indoor.png'"
+	          />
+	          <view class="section_2"></view>
+	        </view>
+	        <text class="self-start font_3 text_8 mt-5">室内</text>
+	      </view>
+	      <view class="flex-col section equal-division-item ml-19">
+	        <view class="flex-row justify-between items-end self-stretch">
+	          <image
+	            class="image_4"
+	            :src="clothesRentUrl + '/component/outdoor.png'"
+	          />
+	          <view class="section_2"></view>
+	        </view>
+	        <text class="self-start font_3 text_8 mt-5">室外</text>
+	      </view>
+	    </view>
+	  </view>
+	  <view class="flex-row justify-between items-center group_5">
+	    <view class="flex-row items-baseline">
+	      <text class="font text_9">定金：</text>
+	      <text class="font text_10">￥129.00</text>
+	    </view>
+	    <view class="flex-col justify-start items-center text-wrapper_2"><text class="text_11">确定</text></view>
+	  </view>
+	</view>
+</template>
+
+<script setup>
+	
+</script>
+
+<style scoped lang="scss">
+	.ml-13 {
+	  margin-left: 24.38rpx;
+	}
+	.ml-17 {
+	  margin-left: 31.88rpx;
+	}
+	.mt-5 {
+	  margin-top: 9.38rpx;
+	}
+	.ml-19 {
+	  margin-left: 35.63rpx;
+	}
+	.page {
+	  background-color: #ffffff;
+	  width: 100%;
+	  overflow-y: auto;
+	  overflow-x: hidden;
+	  height: 100%;
+	}
+	.group {
+	  padding: 37.5rpx 22.5rpx;
+	  border-bottom: solid 1.88rpx #0000001f;
+	}
+	.font {
+	  font-size: 37.5rpx;
+	  font-family: FZSongKeBenXiuKaiS-R-GB;
+	  color: #323232;
+	}
+	.text {
+	  margin: 3.75rpx 0;
+	  line-height: 36.34rpx;
+	}
+	.image {
+	  margin-right: 3.75rpx;
+	  width: 52.5rpx;
+	  height: 41.25rpx;
+	}
+	.group_2 {
+	  margin-top: 35.63rpx;
+	}
+	.image_2 {
+	  border-radius: 18.75rpx;
+	  width: 198.75rpx;
+	  height: 200.63rpx;
+	}
+	.group_3 {
+	  margin-right: 112.5rpx;
+	  margin-bottom: 7.5rpx;
+	  width: 369.38rpx;
+	}
+	.font_2 {
+	  font-size: 33.75rpx;
+	  font-family: FZSongKeBenXiuKaiS-R-GB;
+	  line-height: 30.58rpx;
+	  color: #323232;
+	}
+	.text_2 {
+	  line-height: 41.25rpx;
+	}
+	.text_3 {
+	  margin-left: 7.5rpx;
+	  line-height: 22.54rpx;
+	}
+	.group_4 {
+	  margin-left: 26.25rpx;
+	  border-radius: 9.38rpx;
+	  width: 123.75rpx;
+	  height: 97.95rpx;
+	}
+	.text_4 {
+	  line-height: 32.31rpx;
+	}
+	.pos {
+	  position: absolute;
+	  left: 0;
+	  top: 50%;
+	  transform: translateY(-50%);
+	}
+	.text-wrapper {
+	  padding: 15rpx 0;
+	  background-color: #ffffff;
+	  border-radius: 37.5rpx;
+	  width: 159.38rpx;
+	  height: 54.38rpx;
+	  border-left: solid 1.88rpx #c3c3c3;
+	  border-right: solid 1.88rpx #c3c3c3;
+	  border-top: solid 1.88rpx #c3c3c3;
+	  border-bottom: solid 1.88rpx #c3c3c3;
+	}
+	.font_3 {
+	  font-size: 26.25rpx;
+	  font-family: FZSongKeBenXiuKaiS-R-GB;
+	  line-height: 24.21rpx;
+	  color: #323232;
+	}
+	.text_5 {
+	  line-height: 24.41rpx;
+	}
+	.text_6 {
+	  line-height: 23.89rpx;
+	}
+	.text_7 {
+	  margin-top: 33.75rpx;
+	}
+	.equal-division {
+	  align-self: stretch;
+	  margin: 41.25rpx 15rpx 0;
+	}
+	.section {
+	  flex: 1 1 320.63rpx;
+	}
+	.equal-division-item {
+	  padding: 18.75rpx 22.5rpx;
+	  background-color: #ffffff;
+	  border-radius: 18.75rpx;
+	  height: 157.5rpx;
+	  border-left: solid 1.88rpx #c3c3c3;
+	  border-right: solid 1.88rpx #c3c3c3;
+	  border-top: solid 1.88rpx #c3c3c3;
+	  border-bottom: solid 1.88rpx #c3c3c3;
+	}
+	.image_3 {
+	  opacity: 0.85;
+	  border-radius: 18.75rpx;
+	  width: 138.75rpx;
+	  height: 84.38rpx;
+	}
+	.section_2 {
+	  margin-right: 15rpx;
+	  background-color: #ffffff;
+	  border-radius: 50%;
+	  width: 45rpx;
+	  height: 45rpx;
+	  border-left: solid 1.88rpx #c3c3c3;
+	  border-right: solid 1.88rpx #c3c3c3;
+	  border-top: solid 1.88rpx #c3c3c3;
+	  border-bottom: solid 1.88rpx #c3c3c3;
+	}
+	.text_8 {
+	  margin-left: 45rpx;
+	}
+	.image_4 {
+	  border-radius: 15rpx;
+	  width: 138.75rpx;
+	  height: 84.38rpx;
+	}
+	.group_5 {
+	  padding: 37.5rpx 22.5rpx 31.88rpx;
+	}
+	.text_9 {
+	  line-height: 34.42rpx;
+	}
+	.text_10 {
+	  color: #e79ea1;
+	  line-height: 25.05rpx;
+	}
+	.text-wrapper_2 {
+	  padding: 22.5rpx 0;
+	  background-color: #e79ea1;
+	  border-radius: 187.5rpx;
+	  width: 241.88rpx;
+	  height: 76.88rpx;
+	}
+	.text_11 {
+	  color: #ffffff;
+	  font-size: 30rpx;
+	  font-family: FZSongKeBenXiuKaiS-R-GB;
+	  line-height: 28.01rpx;
+	}
+	@import url(../../../common/css/global.css);
+</style>

pages/coupon/CouponMall/CouponMall.vue

@@ -88,7 +88,6 @@
 	})
 	
 	onUnmounted(() => {
-		emitter.emit('flushCouponList')
 		
 		emitter.off('closeConfirmPopup', closeConfirmPopupHandler)
 		

pages/coupon/component/couponPopup.vue

@@ -111,7 +111,7 @@
 	})
 	
 	onUnmounted(() => {
-		uni.removeStorageSync('couponMap')
+		// uni.removeStorageSync('couponMap')
 		emitter.off('getTotalPrice', getTotalPriceHandler)
 		// emitter.off('flushCouponList', flushCouponListHandler)
 	})
@@ -150,7 +150,7 @@
 	}
 	
 	const confirm = () => {
-		if (idx.value !== -1) {
+		if (idx.value !== -1 && isShow.value) {
 			emitter.emit('getCouponObj', myCouponList.value[idx.value])
 		}
 		emitter.emit('closeCoupon')
@@ -193,7 +193,7 @@
 	
 	
 	const jumpToMall = () => {
-		uni.removeStorageSync('couponMap')
+		// uni.removeStorageSync('couponMap')
 		uni.navigateTo({
 			url: '/pages/coupon/CouponMall/CouponMall'
 		})

pages/mine/component/contactPop.vue

@@ -10,7 +10,7 @@
     </view>
     <view class="flex-row items-center group_1">
       <text class="font_2">手机号码</text>
-      <input class="view_2 ml-20" placeholder="输入手机号码" v-model="contactParam.phone"/>
+      <input class="view_2 ml-20" placeholder="输入手机号码" type="tel" maxlength="11" v-model="contactParam.phone"/>
     </view>
     <view class="flex-row justify-between items-center group_2">
 			<text class="font_2 text_5">设为默认联系人</text>

pages/order/product-waitpay/product-waitpay.vue

@@ -413,7 +413,6 @@ const wxPay = async( oid )=> {  //传入订单id
 		showLoading()
 		debounceTimer = setTimeout(async () => {
 			await getMyCouponList()
-			emitter.emit('flushCouponListHandler')
 			hideLoading()
 		}, 1000)
 	}

pages/order/serviceWaitPay/serviceWaitPay.vue

@@ -455,7 +455,6 @@
 		showLoading()
 		debounceTimer = setTimeout(async () => {
 			await getMyCouponList()
-			emitter.emit('flushCouponList')
 			hideLoading()
 		}, 1000)
 	}

pages/order/singleGoodOrder/singleGoodOrder.vue

@@ -310,7 +310,6 @@ const updateAddressHandler = (val) => {
 		showLoading()
 		debounceTimer = setTimeout(async () => {
 			await getMyCouponList()
-			emitter.emit('flushCouponList')
 			hideLoading()
 		}, 1000)
 	}

pages/order/singleServiceWait/singleServiceWait.vue

@@ -452,7 +452,6 @@
 		showLoading()
 		debounceTimer = setTimeout(async () => {
 			await getMyCouponList()
-			// emitter.emit('flushCouponList')
 			hideLoading()
 		}, 1000)
 	}

pages/testPage/testPage.vue

@@ -1,10 +1,10 @@
 <template>
-	<!-- <addressSelectedVue></addressSelectedVue> -->
+	<clothesAttributeVue></clothesAttributeVue>
-	<!-- <ContactVue></ContactVue> -->
 </template>
 
 <script setup>
 import { onMounted } from 'vue';
+	import clothesAttributeVue from '../clothesRent/component/clothesAttribute.vue';
 	onMounted(() => {
 		getUrl()
 	})