From 27b04a4847ddf213d74f4e3f714766787fe0ff4f Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Thu, 26 Sep 2024 09:12:07 +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

---
 mixins/list.js                        |  64 +++++++++++++++++
 pages.json                            |   3 +
 pages_order/mine/help.vue             | 129 ++++++++++++++++++++++++++++++++++
 pages_order/static/help/uploading.png | Bin 0 -> 7380 bytes
 utils/utils.js                        |  65 +++++++++++++----
 5 files changed, 247 insertions(+), 14 deletions(-)
 create mode 100644 mixins/list.js
 create mode 100644 pages_order/mine/help.vue
 create mode 100644 pages_order/static/help/uploading.png

diff --git a/mixins/list.js b/mixins/list.js
new file mode 100644
index 0000000..4962057
--- /dev/null
+++ b/mixins/list.js
@@ -0,0 +1,64 @@
+
+
+
+function query(self, queryParams){
+	// return (self.beforeGetData && self.beforeGetData()) ||
+	// queryParams || self.queryParams
+	
+	// 深度合并对象
+	return self.$utils.deepMergeObject(
+	
+	self.$utils.deepMergeObject(self.queryParams,
+	
+	(self.beforeGetData && self.beforeGetData()) || {}),
+	
+	queryParams)
+}
+
+
+
+export default {
+	data() {
+		return {
+			queryParams: {
+				pageNo: 1,
+				pageSize: 10,
+			},
+			total : 0,
+			list : [],
+		}
+	},
+	onReachBottom() {
+		this.loadMoreData()
+	},
+	methods: {
+		getData(queryParams){
+			return new Promise((success, error) => {
+				if(!this.mixinsListApi){
+					return console.error('mixinsListApi 缺失');
+				}
+				this.$api(this.mixinsListApi, 
+				query(this, queryParams), res => {
+					uni.stopPullDownRefresh()
+					if(res.code == 200){
+						
+						this.getDataThen && this.getDataThen(res.result.records, res.result.total, res.result)
+						
+						success(res.result)
+						
+						this[this.mixinsListKey || 'list'] = res.result.records
+						
+						this.total = res.result.total
+					}
+				})
+			})
+		},
+		loadMoreData(){
+			console.log('loadMoreData----', this.queryParams.pageSize < this.total);
+			if(this.queryParams.pageSize < this.total){
+				this.queryParams.pageSize += 10
+				this.getData()
+			}
+		},
+	}
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 42e5874..e8910a4 100644
--- a/pages.json
+++ b/pages.json
@@ -64,6 +64,9 @@
 			},
 			{
 				"path": "auth/loginAndRegisterAndForgetPassword"
+			},
+			{
+				"path": "mine/help"
 			}
 		]
 	}],
diff --git a/pages_order/mine/help.vue b/pages_order/mine/help.vue
new file mode 100644
index 0000000..6c7dee6
--- /dev/null
+++ b/pages_order/mine/help.vue
@@ -0,0 +1,129 @@
+<template>
+	<!-- 帮助与反馈 -->
+	<view class="help">
+		<navbar title="帮助与反馈" leftClick @leftClick="$utils.navigateBack" />
+		<view class="help-box">
+			<view>
+				<view class="help-issue">
+					<text>问题和意见</text>
+					<text style="color: #BD3624;">*</text>
+				</view>
+				<uv-textarea v-model="value" :count="true" border="none" height="400"
+					placeholder="请把发现的问题提交给我们，感谢您的参与(必填)" 
+					:text-style="{color:'#BCB7B7',fontSize:'28rpx'}" />
+			</view>
+
+			<view>
+				<view class="help-issue">
+					<text>问题截图</text>
+					<text style="color: #BD3624;">*</text>
+				</view>
+
+				<view class="help-screenshot">
+					<uv-upload :fileList="fileList" multiple :maxCount="3" width="180rpx"
+						height="180rpx" multiple @afterRead="afterRead" @delete="deleteImage">
+						<image src="../static/help/uploading.png" mode="aspectFill"
+							style="width: 180rpx;height: 180rpx;" />
+					</uv-upload>
+				</view>
+			</view>
+
+			<!-- <view>
+				<view class="help-issue">
+					<text>联系方式</text>
+					<text style="color: #BD3624;">*</text>
+				</view>
+				<uv-input placeholder="请输入联系方式" fontSize="24rpx" border="bottom"
+					:custom-style="{backgroundColor: '#fff'}">
+					<template #prefix>
+						<uv-text text="联系姓名" size="24rpx" margin="20rpx 10rpx 20rpx 10rpx" />
+					</template>
+				</uv-input>
+				<uv-input placeholder="请输入联系姓名" border="none" fontSize="24rpx"
+					:custom-style="{backgroundColor: '#fff'}">
+					<template #prefix>
+						<uv-text text="联系方式" size="24rpx" margin="20rpx 10rpx 20rpx 10rpx" />
+					</template>
+				</uv-input>
+			</view> -->
+			<view class="help-button">
+				<view>确认</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				value: "",
+				fileList: []
+			}
+		},
+		onLoad(args) {
+
+		},
+		methods: {
+			deleteImage(e){
+				this.fileList.splice(e.index, 1)
+			},
+			afterRead(e){
+				let self = this
+				e.file.forEach(file => {
+					self.$Oss.ossUpload(file.url).then(url => {
+						self.fileList.push({
+							url
+						})
+					})
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.help {
+		.help-box {
+			width: 92%;
+			margin-left: 4%;
+
+			.help-issue {
+				margin: 20rpx;
+				font-size: 28rpx;
+				font-weight: 600;
+				color: #333333;
+			}
+
+			.help-screenshot {
+				display: flex;
+				align-items: center;
+				background-color: #fff;
+				padding: 20rpx;
+			}
+
+			.help-button {
+				display: flex;
+				justify-content: center;
+				font-size: 24rpx;
+				flex-shrink: 0;
+				margin-top: 60rpx;
+
+				view {
+					padding: 14rpx 120rpx;
+					border-radius: 38rpx;
+				}
+
+				view:nth-child(1) {
+					background: $uni-color;
+					color: #fff;
+				}
+
+				view:nth-child(2) {
+					color: #FFFDF6;
+					background-color: #C83741;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_order/static/help/uploading.png b/pages_order/static/help/uploading.png
new file mode 100644
index 0000000000000000000000000000000000000000..d558b9ed8492aec8cd11f12b79331ab51f0e3abc
GIT binary patch
literal 7380
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
JNmN6J{U24a<fZ@s

literal 0
HcmV?d00001

diff --git a/utils/utils.js b/utils/utils.js
index 87f73fc..dabe1e0 100644
--- a/utils/utils.js
+++ b/utils/utils.js
@@ -36,33 +36,56 @@ function generateLightRandomColor() {
 
 function verificationAll(data, msg){
 	
-	let Msgs = {
-		default : msg || '表单数据未填写'
-	}
-	
-	if(typeof msg == 'object'){
-		Msgs = {
-			default : '表单数据未填写',
-			...msg,
-		}
+	if (!msg){
+		console.log(msg);
+		return false
 	}
 	
 	if (!data){
 		uni.showToast({
-			title: Msgs.default,
+			title: '表单数据未填写',
 			icon: "none"
 		})
-		return true
 	}
-	for (let key in data) {
-	    if (!data[key] || data[key] === "") {
+	
+	for (let key in msg) {
+	    if (!data[key]) {
 			uni.showToast({
-				title: (Msgs[key] || Msgs.default),
+				title: msg[key],
 				icon: "none"
 			})
 			return true
 	    }
 	}
+	
+	
+	// let Msgs = {
+	// 	default : msg || '表单数据未填写'
+	// }
+	
+	// if(typeof msg == 'object'){
+	// 	Msgs = {
+	// 		default : '表单数据未填写',
+	// 		...msg,
+	// 	}
+	// }
+	
+	// if (!data){
+	// 	uni.showToast({
+	// 		title: Msgs.default,
+	// 		icon: "none"
+	// 	})
+	// 	return true
+	// }
+	// for (let key in data) {
+	//     if (!data[key] || data[key] === "") {
+	// 		uni.showToast({
+	// 			title: (Msgs[key] || Msgs.default),
+	// 			icon: "none"
+	// 		})
+	// 		return true
+	//     }
+	// }
 	return false
 }
 
@@ -108,6 +131,19 @@ export function deepMergeObject(a, b){
 	return mergeObject(data, b)
 }
 
+//复制内容
+export function copyText(content) {
+	uni.setClipboardData({
+		data: content,
+		success: () => {
+			uni.showToast({
+				title: '复制成功',
+				icon: 'none'
+			})
+		}
+	})
+}
+
 function params(url){
 	if(typeof url == 'object'){
 		return url
@@ -149,4 +185,5 @@ export default {
 	navigateTo,
 	navigateBack,
 	redirectTo,
+	copyText
 }
\ No newline at end of file