Merge branch 'dev1.0.0' into develop

common/utils/requset.js

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-17 17:42:32
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 16:02:45
+ * @LastEditTime: 2022-04-21 17:20:17
  * @Description: 项目接口请求统一处理器，返回一个需要token和不需要token的请求封装方法
  */
 
@@ -11,8 +11,8 @@ import $store from '@/common/store';
 
 const ENV = 'test';
 const BASE_URL = {
-	'test' : 'http://k8s-horse-gateway.mashibing.cn',
-	// 'test' : '',
+	// 'test' : 'http://k8s-horse-gateway.mashibing.cn',
+	'test' : '',
 	'release' : '',
 	'prod' : ''
 };

components/UiCopy.vue

@@ -0,0 +1,34 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-04-21 17:27:16
+ * @LastEditors: ch
+ * @LastEditTime: 2022-04-21 17:35:17
+ * @Description: file content
+-->
+<template>
+	<text @click="copy" class="ui-copy">复制</text>
+</template>
+<script>
+export default {
+	props : {
+		value : {
+			type : String | Number,
+			default : ''
+		}
+	},
+	methods : {
+		copy(){
+			uni.setClipboardData({
+				data : this.value,
+				showToast : true
+			})
+		}
+	}
+}
+</script>
+<style lang="scss" scoped>
+.ui-copy{
+	color: $color-yellow4;
+	font-size: $font-size-sm;
+}
+</style>

components/UiMoney.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-21 09:54:15
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 15:41:48
+ * @LastEditTime: 2022-04-21 17:44:58
  * @Description: file content
 -->
 <template>
@@ -52,6 +52,7 @@ export default {
 		moneyArr (){
 			let moneyArr = (this.money || '0').toString().split('.');
 			// 如果需要补0 则整数时补00
+			console.log(this.flaot);
 			if(this.flaot){
 				if(!moneyArr[1]){
 					moneyArr[1] = '00';
@@ -59,6 +60,7 @@ export default {
 					moneyArr[1] = `0${moneyArr[1]}`;
 				}
 			}
+			console.log(moneyArr);
 			return moneyArr;
 		}
 

pages/cart/cart.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2019-08-22 19:41:20
  * @LastEditors: ch
- * @LastEditTime: 2022-04-09 10:38:25
+ * @LastEditTime: 2022-04-21 18:05:32
  * @Description: file content
 -->
 <template>
@@ -18,7 +18,6 @@ export default {
 	},
 	mounted(){
 		this.$refs.page.open();
-		
 	}
 }
 </script>

pages/order/detail/components/Operation.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-15 17:46:10
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 14:49:57
+ * @LastEditTime: 2022-04-21 18:04:27
  * @Description: file content
 -->
 <template>

pages/order/detail/components/OrderInfo.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-15 16:04:28
  * @LastEditors: ch
- * @LastEditTime: 2022-04-18 14:48:59
+ * @LastEditTime: 2022-04-21 17:45:16
  * @Description: file content
 -->
 <template>
@@ -10,7 +10,10 @@
 		<UiWhiteBox class="cell-box">
 			<view class="cell">
 				<text class="cell--title">订单编号:</text>
-				<text class="cell--value">{{orderInfo.orderNo}}</text>
+				<view class="cell--value">
+					<text class="cell--orderNo">{{orderInfo.orderNo}}</text>
+					<UiCopy :value="orderInfo.orderNo"/>
+				</view>
 			</view>
 			<view class="cell">
 				<text class="cell--title">订单时间:</text>
@@ -37,7 +40,8 @@
 			</view>
 			<view class="amount-box">
 				<text class="amount-label">实付款：</text>
-				<text class="amount">￥{{orderInfo.payAmount}}</text>
+				<UiMoney :money="orderInfo.payAmount" flaot prefix suffix/>
+				<!-- <text class="amount">￥{{orderInfo.payAmount}}</text> -->
 			</view>
 			
 		</UiWhiteBox>
@@ -45,8 +49,10 @@
 </template>
 <script>
 import UiWhiteBox from '@/components/UiWhiteBox.vue';
+import UiCopy from '../../../../components/UiCopy.vue';
+import UiMoney from '../../../../components/UiMoney.vue';
 export default {
-	components : {UiWhiteBox},
+	components : {UiWhiteBox, UiCopy, UiMoney},
 	props: {
 		orderInfo : {
 			type : Object,
@@ -68,6 +74,10 @@ export default {
 	&--value{
 		font-size: $font-size-sm;
 	}
+	&--orderNo{
+		margin-right: 20rpx;
+		font-size: $font-size-sm;
+	}
 	&--title{
 		color: $color-grey4;
 		font-size: $font-size-sm;
@@ -76,6 +86,9 @@ export default {
 .amount-box{
 	text-align: right;
 	margin-top: 30rpx;
+	display: flex;
+	align-items: center;
+	justify-content: flex-end;
 }
 
 .amount-label{
@@ -85,4 +98,18 @@ export default {
 	color: $color-yellow4;
 	font-size: $font-size-lg;
 }
+/deep/ {
+	.ui-money--price{
+		font-size: 36rpx;
+		color: $color-yellow4;
+	}
+	.ui-money--prefix{
+		font-size: $font-size-sm;
+		color: $color-yellow4;
+	}
+	.ui-money--suffix{
+		font-size: $font-size-base;
+		color: $color-yellow4;
+	}
+}
 </style>

pages/order/detail/components/StatusTips.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-31 17:53:43
  * @LastEditors: ch
- * @LastEditTime: 2022-04-15 17:43:17
+ * @LastEditTime: 2022-04-21 17:24:22
  * @Description: file content
 -->
 <template>
@@ -46,13 +46,14 @@ export default {
 			const {orderStatus} = this.orderInfo;
 			this.ctxCon = this.ctxData[orderStatus];
 			
-			if(orderStatus === '1'){
+			if(orderStatus === 1){
 				// 待支付 开始倒计时
 				if(this.timerStop){
 					clearTimeout(this.timerStop);
 				}
 				this.calcTimerStartSecondNum();
 				this.timer();
+
 			}else if(orderStatus === '2'){
 				this.ctxCon.tips = this.orderInfo.closeReason;
 			}

pages/order/list.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 10:58:24
  * @LastEditors: ch
- * @LastEditTime: 2022-04-19 18:10:45
+ * @LastEditTime: 2022-04-21 17:36:30
  * @Description: file content
 -->
 <template>
@@ -13,7 +13,7 @@
 				{{item.name}}</text>
 		</view>
 		<BsEmpty v-if="!orderListData.length && loadingStatus === 'nomore'" tips="暂无订单记录呢~" :icon="require('@/static/order/empty.png')">
-			<ui-button slot="btn" type="line" @click="$Router('/')">去逛逛</ui-button>
+			<ui-button slot="btn" type="line" @click="$Router.push('/')">去逛逛</ui-button>
 		</BsEmpty>
 
 		<view class="orders" v-for="item in orderListData" :key="item.orderId">