From c2b3f31ad001f0f738d6243bc66580935d423d8d Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Mon, 14 Oct 2024 19:33:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                            |   1 +
 common.scss                                        |  40 +++++++
 components/bottom/bottomBtn.vue                    |  81 --------------
 components/config/customerServicePopup.vue         | 116 +++++++++++++++++++++
 pages/index/center.vue                             |  67 ------------
 .../auth/loginAndRegisterAndForgetPassword.vue     |   5 +-
 pages_order/order/refundsOrExchange.vue            |  10 +-
 utils/position.js                                  |   4 +-
 8 files changed, 163 insertions(+), 161 deletions(-)
 create mode 100644 common.scss
 delete mode 100644 components/bottom/bottomBtn.vue
 create mode 100644 components/config/customerServicePopup.vue

diff --git a/App.vue b/App.vue
index 5676699..cc1058b 100644
--- a/App.vue
+++ b/App.vue
@@ -11,6 +11,7 @@
 </script>
 
 <style>
+	@import url("common.scss");
 	/*每个页面公共css */
 	body{
 		background-color: #f7f7f7;
diff --git a/common.scss b/common.scss
new file mode 100644
index 0000000..5fd3072
--- /dev/null
+++ b/common.scss
@@ -0,0 +1,40 @@
+
+// 文字益处处理
+.text-ellipsis{
+	overflow:hidden; //超出的文本隐藏
+	text-overflow:ellipsis; //溢出用省略号显示
+	white-space:nowrap; //溢出不换行
+}
+.text-ellipsis-2{
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display:-webkit-box; //作为弹性伸缩盒子模型显示。
+	-webkit-box-orient:vertical; //设置伸缩盒子的子元素排列方式--从上到下垂直排列
+	-webkit-line-clamp:2; //显示的行
+}
+.text-ellipsis-3{
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display:-webkit-box; //作为弹性伸缩盒子模型显示。
+	-webkit-box-orient:vertical; //设置伸缩盒子的子元素排列方式--从上到下垂直排列
+	-webkit-line-clamp:3; //显示的行
+}
+
+
+.share{
+	padding: 0;
+	margin: 0;
+	background-color: #fff;
+	display: flex !important;
+	flex-direction: column !important;
+	justify-content: center !important;
+	align-items: center !important;
+	font-size: 26rpx;
+}
+.share::after{
+	border: none;
+	padding: 0;
+	margin: 0;
+	width: 0;
+	height: 0;
+}
\ No newline at end of file
diff --git a/components/bottom/bottomBtn.vue b/components/bottom/bottomBtn.vue
deleted file mode 100644
index eb9ddf1..0000000
--- a/components/bottom/bottomBtn.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-	<view @click="$emit('confirm')" :style="{ 
-      position: 'fixed', 
-      display: 'flex', 
-      justifyContent: 'center', 
-      alignItems: 'center', 
-      width: '100vw', 
-      bottom: bottom  
-    }">
-		<button :style="{
-			     color: color,
-			     backgroundColor: backgroundColor,
-			     fontSize: fontSize,
-			     width: width,
-			     height: height,
-			     borderRadius: borderRadius
-			   }">
-			{{ text }}
-		</button>
-	</view>
-</template>
-
-<script>
-	export default {
-		props: {
-			color: {
-				default: '#000000' // 设置默认颜色值
-			},
-			backgroundColor: {
-				default: '#FFFFFF' // 设置默认背景颜色
-			},
-			fontSize: {
-				default: '36rpx' // 设置默认字体大小
-			},
-			text: {
-				default: '按钮' // 设置默认文本内容
-			},
-			width: {
-				default: '150rpx' // 设置默认宽度
-			},
-			height: {
-				default: '60rpx' // 设置默认高度
-			},
-			borderRadius: {
-				default: '40rpx' // 设置默认高度
-			},
-			bottom: {
-				default: '40rpx' // 设置默认距离底部高度
-			},
-
-		},
-
-		data() {
-			return {
-
-			}
-		},
-		methods: {
-
-		}
-	}
-</script>
-
-<style scoped lang="less">
-	// .container {
-	// 	position: fixed;
-	// 	display: flex;
-	// 	justify-content: center;
-	// 	/* 水平居中 */
-	// 	align-items: center;
-	// 	/* 垂直居中 */
-	// 	width: 100%;
-	// 	/* 使容器宽度覆盖整个屏幕 */
-	// }
-
-	button {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-</style>
\ No newline at end of file
diff --git a/components/config/customerServicePopup.vue b/components/config/customerServicePopup.vue
new file mode 100644
index 0000000..d2d73a6
--- /dev/null
+++ b/components/config/customerServicePopup.vue
@@ -0,0 +1,116 @@
+<template>
+	<!-- 联系客服弹框 -->
+	<uv-overlay :show="show" @click="close">
+		<view class="warp">
+			<view class="rect" @tap.stop>
+				<view class="title">联系客服</view>
+				<view class="center">确定拨打客服电话?</view>
+				<view class="bottom">
+					<view class="btn1"
+					@click="close">
+						取消
+					</view>
+					<view class="btn2"
+					@click="confirm">
+						确定
+					</view>
+				</view>
+			</view>
+		</view>
+	</uv-overlay>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				show: false,
+				phone:'',
+			}
+		},
+		onLoad() {
+			this.getCustomPhone()
+		},
+		methods: {
+			getCustomPhone(){
+				this.$api('customUser', {}, res => {
+					this.phone = res.result.phone
+				})
+			},
+			open() {
+				this.show = true
+			},
+			close() {
+				this.show = false
+			},
+			// 拨打电话
+			confirm() {
+				this.show = false
+				uni.makePhoneCall({
+					phoneNumber: this.phone,
+					success() {
+						console.log('安卓拨打成功');
+					},
+					fail() {
+						console.log('安卓拨打失败');
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.warp {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 100%;
+
+	}
+
+	.rect {
+		width: 600rpx;
+		height: 300rpx;
+		background-color: #fff;
+		border-radius: 20rpx;
+		overflow: hidden;
+
+		.title {
+			padding: 10rpx 0 0 15rpx;
+			background-color: $uni-color;
+			color: #FFF;
+			text-align: left;
+			width: 100%;
+			height: 18%;
+			font-size: 36rpx;
+		}
+
+		.center {
+			height: 40%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			font-size: 36rpx;
+		}
+
+		.bottom {
+			display: flex;
+			justify-content: center;
+			gap: 50rpx;
+			view{
+				height: 60rpx;
+				line-height: 60rpx;
+				padding: 0 50rpx;
+				border-radius: 30rpx;
+			}
+			.btn1{
+				background-color: #fff;
+			}
+			.btn2{
+				background-color: $uni-color;
+				color: #fff;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/center.vue b/pages/index/center.vue
index bb528c3..151e503 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -120,27 +120,6 @@
 			</view>
 		</view>
 
-		<!-- 联系客服弹框 -->
-		<uv-overlay :show="show" @click="show = false">
-			<view class="warp">
-				<view class="rect" @tap.stop>
-					<view class="title">联系客服</view>
-					<view class="center">确定拨打客服电话?</view>
-					<view class="bottom">
-						<view>
-							<uv-button type="info" shape="circle" text="取消" :custom-style="customStyle1"
-								@click="cancle"></uv-button>
-						</view>
-						<view>
-							<uv-button type="info" shape="circle" text="确定" :custom-style="customStyle2"
-								@click="confirm"></uv-button>
-						</view>
-					</view>
-				</view>
-			</view>
-		</uv-overlay>
-
-
 		<tabber select="4" />
 	</view>
 </template>
@@ -158,44 +137,12 @@
 		},
 		computed: {
 			...mapGetters(['userShop']),
-			customStyle1() {
-				return {
-					height: '60rpx',
-					background: '#FFF',
-					color: '#000000',
-					fontSize: '36rpx',
-					borderRadius: '40rpx', //圆角
-
-					// nvue中必须是下方的写法
-					'border-top-right-radius': '40rpx',
-					'border-bottom-left-radius': '40rpx',
-					'border-bottom-right-radius': '40rpx',
-					'width': '150rpx',
-				}
-			},
-			customStyle2() {
-				return {
-					height: '60rpx',
-					background: '#fd5100',
-					color: '#FFF',
-					fontSize: '34px',
-					borderRadius: '40rpx', //圆角
-					// nvue中必须是下方的写法
-					'border-top-right-radius': '40rpx',
-					'border-bottom-left-radius': '40rpx',
-					'border-bottom-right-radius': '40rpx',
-					'width': '150rpx',
-				}
-			}
 		},
 		data() {
 			return {
-				show: false,
 			}
 		},
 		methods: {
-
-
 			headBtn() {
 				let self = this
 				uni.showModal({
@@ -207,20 +154,6 @@
 					}
 				})
 			},
-
-			// 联系客服按钮回调
-			contactUs() {
-				this.show = true
-			},
-			confirm() {
-				this.show = false
-			},
-
-			cancle() {
-				this.show = false
-			},
-
-
 		}
 	}
 </script>
diff --git a/pages_order/auth/loginAndRegisterAndForgetPassword.vue b/pages_order/auth/loginAndRegisterAndForgetPassword.vue
index ac54989..1680203 100644
--- a/pages_order/auth/loginAndRegisterAndForgetPassword.vue
+++ b/pages_order/auth/loginAndRegisterAndForgetPassword.vue
@@ -28,7 +28,7 @@
 					<view>
 						<uv-checkbox-group v-model="checkboxValue" shape="circle">
 							<view class="content">
-								<view style="display: flex;">
+								<view style="display: flex;flex-wrap: wrap;">
 									<uv-checkbox size="30rpx" :name="1"></uv-checkbox>
 									请你阅读并同意我们的<span style="color: #fd5100"
 									@click="$refs.popup.open('getPrivacyPolicy')">《隐私条款》</span>和<span
@@ -234,8 +234,7 @@
 				}
 
 				.form {
-					height: 12vh;
-
+					line-height: 50rpx;
 					>view:nth-of-type(1) {
 						padding: 20rpx 100rpx;
 					}
diff --git a/pages_order/order/refundsOrExchange.vue b/pages_order/order/refundsOrExchange.vue
index 3bce4d8..3ae96c5 100644
--- a/pages_order/order/refundsOrExchange.vue
+++ b/pages_order/order/refundsOrExchange.vue
@@ -76,12 +76,7 @@
     </view>
 
     <!-- 底部按钮 -->
-    <bottomBtn @confirm='confirm()' :color='bottomBtnStyle.color' :backgroundColor='bottomBtnStyle.backgroundColor'
-               :fontSize='bottomBtnStyle.fontSize' :text='bottomBtnStyle.text' :width="bottomBtnStyle.width"
-               :height="bottomBtnStyle.height" :borderRadius='bottomBtnStyle.borderRadius'
-			   :bottom='bottomBtnStyle.bottom'
-			   >
-    </bottomBtn>
+   
 
     <!--商品选择-->
     <uv-popup ref="spPopup" :round="30">
@@ -95,7 +90,6 @@
 </template>
 
 <script>
-import bottomBtn from "../../components/bottom/bottomBtn.vue"
 import commoditySelect from "../components/commodity/commoditySelect.vue"
 
 export default {
@@ -103,7 +97,7 @@ export default {
     this.titleIndex = option.index
   },
   components: {
-    bottomBtn, commoditySelect
+     commoditySelect
   },
   data() {
     return {
diff --git a/utils/position.js b/utils/position.js
index d831ca0..09513cd 100644
--- a/utils/position.js
+++ b/utils/position.js
@@ -8,7 +8,7 @@ import config from '../config.js'
  * @param {number} lon2 地点2维度
  * @param {number} fixed 保留几位小数,默认0,单位km
  */
-function calculateDistance(lat1, lon1, lat2, lon2) { //计算两点距离
+function calculateDistance(lat1, lon1, lat2, lon2, fixed = 0) { //计算两点距离
 	let distance = 0
 	if (!lat2 || !lon2) return distance
 	//先强制转换一下(后端给的字符串)
@@ -28,7 +28,7 @@ function calculateDistance(lat1, lon1, lat2, lon2) { //计算两点距离
 	const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
 	// 计算距离  
 	distance = R * c;
-	return distance.toFixed(0)
+	return distance.toFixed(fixed)
 }
 
 function getLocation(fn) { //获取用户经纬度