From 3ecad90fd6681ca82d8999164f05c1dcbe4ee377 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Thu, 27 Jun 2024 20:15:39 +0800
Subject: [PATCH] add

---
 api/user.js                                   |  4 +
 components/bindPhone.vue                      | 88 ++++++++---------
 components/goodPopup.vue                      |  1 -
 pages/index/index.vue                         | 11 ++-
 pages/my/my.vue                               | 95 ++++++++++++++++++-
 pagesOrder/setPayPassword/index.vue           |  2 +-
 pagesOrder/settle/settle.vue                  |  6 +-
 .../zy-passwordboard/zy-passwordboard.vue     |  2 +-
 8 files changed, 155 insertions(+), 54 deletions(-)

diff --git a/api/user.js b/api/user.js
index c0d94dd..11f60ff 100644
--- a/api/user.js
+++ b/api/user.js
@@ -145,4 +145,8 @@ export const getloginSms = (data) => {
 
 export const getReportingSms = (data) => {
 	return request.post('/user/user/reporting_sms', data);
+}
+
+export const uploadImg = (data) => {
+	return request.post('/Upload/image', data);
 }
\ No newline at end of file
diff --git a/components/bindPhone.vue b/components/bindPhone.vue
index 835b91a..09df2e3 100644
--- a/components/bindPhone.vue
+++ b/components/bindPhone.vue
@@ -1,53 +1,55 @@
 <template>
-  <up-popup :show="show" round="10" @close="close" mode="center" :safeAreaInsetBottom="false">
-    <view class="m-modal-popup">
-      <view class="head-title-modal">绑定手机号</view>
-      <view class="content-modal">系统检测到您未绑定手机号, 为方便您继续使用, 请绑定手机号码</view>
-      <view class="btn-box-modal">
-        <view style="width: 130rpx;"><up-button @click="close" plain color="#999">取消绑定</up-button></view>
-        <view style="width: 350rpx;"><up-button @getphonenumber="change" open-type="getPhoneNumber" color="#20B128">立即绑定</up-button></view>
-      </view>
-    </view>
-  </up-popup>
+	<up-popup :show="show" round="10" @close="close" mode="center" :safeAreaInsetBottom="false">
+		<view class="m-modal-popup">
+			<view class="head-title-modal">绑定手机号</view>
+			<view class="content-modal">系统检测到您未绑定手机号, 为方便您继续使用, 请绑定手机号码</view>
+			<view class="btn-box-modal">
+				<view style="width: 130rpx;"><up-button @click="close" plain color="#999">取消绑定</up-button></view>
+				<view style="width: 350rpx;"><up-button @getphonenumber="change" open-type="getPhoneNumber"
+						color="#20B128">立即绑定</up-button></view>
+			</view>
+		</view>
+	</up-popup>
 </template>
 
 <script setup>
+	const props = defineProps({
+		show: {
+			type: Boolean,
+			default: false
+		}
+	})
 
-  const props = defineProps({
-    show: {
-      type: Boolean,
-      default: false
-    }
-  })
-
-  const emit = defineEmits(['close', 'change']);
-  const close = () => {
-    emit('close');
-  }
-  
-  const change = (e)=>{
-    emit('change', e);
-  }
+	const emit = defineEmits(['close', 'change']);
+	const close = () => {
+		emit('close');
+	}
 
+	const change = (e) => {
+		emit('change', e);
+	}
 </script>
 
 <style scoped lang="scss">
-  .m-modal-popup{
-    width: 500rpx;
-    padding: 40rpx;
-    .head-title-modal{
-      font-size: 32rpx;
-      text-align: center;
-    }
-    .content-modal{
-      font-size: 26rpx;
-      color: #999;
-      text-align: center;
-      padding: 40rpx 0;
-    }
-    .btn-box-modal{
-      display: flex;
-      justify-content: space-between;
-    }
-  }
+	.m-modal-popup {
+		width: 500rpx;
+		padding: 40rpx;
+
+		.head-title-modal {
+			font-size: 32rpx;
+			text-align: center;
+		}
+
+		.content-modal {
+			font-size: 26rpx;
+			color: #999;
+			text-align: center;
+			padding: 40rpx 0;
+		}
+
+		.btn-box-modal {
+			display: flex;
+			justify-content: space-between;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/components/goodPopup.vue b/components/goodPopup.vue
index b0a12e5..e3fedb6 100644
--- a/components/goodPopup.vue
+++ b/components/goodPopup.vue
@@ -81,7 +81,6 @@
 	})
 
 	const valChange = () => {
-		console.log(4545)
 		uni.vibrateShort();
 	}
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7ab4669..ff84b16 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -220,7 +220,7 @@
 				</view>
 			</view>
 			<view class="btn">
-				<up-button color="#20b128" :disabled="cartInfo.pay_price<=0" @click="settleAccounts"> 结算</up-button>
+				<up-button color="#20b128" :disabled="cartInfo.pay_price<=0" @click="settleAccounts"> 支付</up-button>
 			</view>
 			<view class="cart" @click="navTo(`/pages/cart/cart`)">
 				<image src="@/static/icon/cart.png"></image>
@@ -237,11 +237,11 @@
 						温馨提示
 					</view>
 					<view class="rect-contetn">
-						只需再购买 {{500- cartInfo.pay_price}} 元，就能拥有10%的品牌礼品券，若错过此次机会则无礼品券
+						只需再凑满 {{500- cartInfo.pay_price}} 元，即可享受采购金额10%的品牌礼品兑换券，错过此次机会则无礼品券。
 					</view>
 					<view class="rect-btn">
 						<view style="width: 236rpx;">
-							<up-button @click="abandActive">放弃优惠</up-button>
+							<up-button @click="abandActive">放弃礼品券</up-button>
 						</view>
 						<view style="width: 236rpx;">
 							<up-button color="#20b128" @click="showOverlay=false">继续采购</up-button>
@@ -586,6 +586,9 @@
 				}
 			}
 		})
+
+		if (!url) return;
+
 		uni.navigateTo({
 			url: url
 		})
@@ -596,6 +599,8 @@
 	const goodRef = ref(null);
 	const goodData = ref({});
 	const openGoodPopup = (item) => { // 打开数量/重量弹窗
+		navTo(false)
+		if (!userStore.token || !userStore.userInfo.mobile) return;
 		goodData.value = item;
 		goodRef.value.setData(item);
 		showGoodPopup.value = true;
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 43eea3e..468167e 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -43,7 +43,7 @@
 			<image class="bg" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e3a7b202404261113002322.webp"
 				mode="widthFix"></image>
 			<view class="u-card">
-				<view style="display: flex;">
+				<view style="display: flex;" @click="updataInfp">
 					<up-avatar :src="userInfo.avatar" size="56"></up-avatar>
 					<view class="content">
 						<view class="u-phone">{{userInfo.nickname}}</view>
@@ -139,10 +139,38 @@
 			</up-cell-group>
 		</view>
 	</view>
+
+	<up-popup :show="showPop" @close="showPop=false" @open="showPop=true">
+		<view class="popContent">
+			<view style="text-align: center;font-size: 30rpx;font-weight: bold;">
+				修改个人信息
+			</view>
+			<up-form labelPosition="left">
+				<up-form-item label="呢称" prop="userInfo.name" borderBottom ref="item1">
+					<up-input v-model="formData.nick_name" border="none" placeholder="请输入个人呢称"></up-input>
+				</up-form-item>
+				<up-form-item label="头像" prop="userInfo.sex" borderBottom ref="item1">
+					<up-image :src="formData.avatar" width="80px" height="80px" @click="uploadAvatar"></up-image>
+				</up-form-item>
+			</up-form>
+			<view style="display: flex;margin-top: 40rpx;justify-content: space-around;">
+				<view style="width: 200rpx;">
+					<up-button color="#20b128" @click="updataFn">保存</up-button>
+				</view>
+				<view style="width: 200rpx;">
+					<up-button @click="showPop=false">取消</up-button>
+				</view>
+			</view>
+
+			<!-- <button></button> -->
+		</view>
+	</up-popup>
+
 </template>
 
 <script setup>
 	import {
+		reactive,
 		ref
 	} from "vue";
 	import useUserStore from "@/store/user";
@@ -154,13 +182,21 @@
 		onPullDownRefresh
 	} from "@dcloudio/uni-app"
 	import {
-		userInfoApi
+		userInfoApi,
+		uploadImg,
+		loginUpdateUserApi
 	} from "@/api/user.js"
+	import {
+		config
+	} from "@/config/app.js"
+
+	console.log()
 
 
 
 	const userStore = useUserStore();
 	const userInfo = ref({});
+	let token = uni.getStorageSync('token') || ''
 	const orderCount = ref({
 		no_pay: 0,
 		receiving: 0,
@@ -197,7 +233,56 @@
 
 	}
 
+	const showPop = ref(false)
 
+	const updataInfp = () => {
+		console.log(5454)
+		showPop.value = true
+	}
+
+	const formData = reactive({
+		nick_name: "",
+		avatar: ""
+
+	})
+
+	const updataFn = () => {
+		loginUpdateUserApi({
+			nickname: formData.nick_name,
+			avatar: formData.avatar
+		}).then(res => {
+			uni.$u.toast('修改成功');
+			showPop.value = false
+			userInfoApi().then(res => {
+				userInfo.value = res.data;
+			})
+		})
+	}
+
+	const uploadAvatar = () => {
+		uni.chooseImage({
+			success: (chooseImageRes) => {
+				uni.showLoading({
+					title: '上传中...'
+				});
+				const tempFilePaths = chooseImageRes.tempFilePaths;
+				uni.uploadFile({
+					url: config.HTTP_REQUEST_URL + '/api/Upload/image', //仅为示例，非真实的接口地址
+					filePath: tempFilePaths[0],
+					name: 'file',
+					header: {
+						token: token,
+					},
+					success: (uploadFileRes) => {
+						let data = JSON.parse(uploadFileRes.data)
+						formData.avatar = data.data.uri
+						uni.hideLoading()
+					}
+				});
+			}
+		});
+
+	}
 
 
 	const logout = () => {
@@ -213,6 +298,9 @@
 	onShow(() => {
 		userInfoApi().then(res => {
 			userInfo.value = res.data;
+			formData.avatar = res.data.avatar
+			formData.nick_name = res.data.nickname
+
 		})
 		getOrderCount();
 	})
@@ -429,6 +517,9 @@
 		overflow: hidden;
 	}
 
+	.popContent {
+		padding: 30rpx 20rpx 50rpx 20rpx;
+	}
 
 	.gift {
 		width: 710rpx;
diff --git a/pagesOrder/setPayPassword/index.vue b/pagesOrder/setPayPassword/index.vue
index fd9d594..a49b916 100644
--- a/pagesOrder/setPayPassword/index.vue
+++ b/pagesOrder/setPayPassword/index.vue
@@ -81,7 +81,7 @@
 	const type = ref(1) // 1 输入密码 2 再次输入密码
 
 	const onKetDown = (e) => {
-		uni.vibrateLong();
+		uni.vibrateShort();
 		if (type.value == 1) {
 			form.password.length < 6 ?
 				form.password += e :
diff --git a/pagesOrder/settle/settle.vue b/pagesOrder/settle/settle.vue
index 95a8960..ef089a1 100644
--- a/pagesOrder/settle/settle.vue
+++ b/pagesOrder/settle/settle.vue
@@ -149,7 +149,7 @@
 
 			<view class="submit-row">
 				<view class="tips">
-					<view style="margin-right: 20rpx;">共 {{ cartList.length }} 款</view>
+					<view style="margin-right: 20rpx;transform: translateY(5rpx);">共 {{ cartList.length }} 款</view>
 					<view class="all">
 						<text style="color: #000;">合计: </text>
 						<text>￥</text>
@@ -161,8 +161,7 @@
 					</view>
 				</view>
 				<view style="width: 200rpx;">
-					<up-button color="#20B128" shape="circle" @click="submitOrder"
-						:throttleTime="1000">预付款提交</up-button>
+					<up-button color="#20B128" shape="circle" @click="submitOrder" :throttleTime="1000">支付</up-button>
 				</view>
 			</view>
 
@@ -559,6 +558,7 @@
 				justify-content: space-between;
 				font-size: 24rpx;
 				margin-top: 10rpx;
+				align-items: center;
 			}
 
 			.time {
diff --git a/uni_modules/zy-passwordboard/components/zy-passwordboard/zy-passwordboard.vue b/uni_modules/zy-passwordboard/components/zy-passwordboard/zy-passwordboard.vue
index 2151e5b..bb0db56 100644
--- a/uni_modules/zy-passwordboard/components/zy-passwordboard/zy-passwordboard.vue
+++ b/uni_modules/zy-passwordboard/components/zy-passwordboard/zy-passwordboard.vue
@@ -43,7 +43,7 @@
 				}
 				break;
 		}
-		uni.vibrateLong();
+		uni.vibrateShort();
 		if (refValue.value.length === props.num) {
 			emits('complete', refValue.value.join(''));
 		}