From 989f802f1ad17567a8210e80d912211da4815974 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Thu, 4 Jul 2024 17:03:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/baseUrl.js        |   4 +-
 pages.json               |   8 ++
 pages/user/login.vue     |  38 ++++--
 pages/user/workOrder.vue | 282 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 320 insertions(+), 12 deletions(-)
 create mode 100644 pages/user/workOrder.vue

diff --git a/config/baseUrl.js b/config/baseUrl.js
index 6018dfc..8602990 100644
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -6,8 +6,8 @@ if (process.env.NODE_ENV === 'development') {
 	// socketUrl = "ws://localhost:6001/";
 	// baseUrl = "https://twin-ui.com/demo/";
 	// baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境
-	baseUrl = "https://api.nuttyreading.com/"; // 线上正式
-	// baseUrl = "http://192.168.110.100:9200/pb/";    //  开发用电脑
+	// baseUrl = "https://api.nuttyreading.com/"; // 线上正式
+	baseUrl = "http://192.168.110.100:9200/pb/";    //  开发用电脑
 	// baseUrl = "http://59.110.212.44:9200/pb/";
 	// baseUrl = "http://192.168.110.100:9100/pb/";    //  开发用电脑
 	// baseUrl = "http://192.168.110.110:9200/pb/";
diff --git a/pages.json b/pages.json
index ccba855..89f3694 100644
--- a/pages.json
+++ b/pages.json
@@ -538,6 +538,14 @@
 				"navigationBarTitleText": "学术webView预览页面",
 				"enablePullDownRefresh": false
 			}
+		},
+		{
+			"path" : "pages/user/workOrder",
+			"style" : 
+			{
+				"navigationBarTitleText" : "工单提交页面",
+				"enablePullDownRefresh": true
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/user/login.vue b/pages/user/login.vue
index 138871c..2f0fcd4 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -97,6 +97,9 @@
 				<button @click="onSubmit" class="active" v-if="btnShow">登 录</button>
 				<button v-else>登 录</button>
 			</view>
+			<view class="loginHelp" v-if="submitClickNum > 0">
+				<text>登陆遇到问题？</text><text class="link" @click="onPageJump('/pages/user/workOrder','login')">去反馈问题</text>
+			</view>
 			<!-- <view class="password_register" style="margin: 0 auto; text-align: center; display: block;">
 				<button @click="onPageJump('/pages/user/register')">注册账号</button>
 				<text v-if="type == 1000" @click="onPageJump('/pages/user/forget')">忘记密码？</text>
@@ -246,7 +249,7 @@
 				quShow: false,
 				quCodeList: [], // 国家区域码
 				quCode: 86,
-
+				submitClickNum:0, // 登陆按钮点击次数
 			};
 		},
 		//第一次加载
@@ -268,6 +271,7 @@
 			this.getCountyCode()
 			this.getSettlement()
 		},
+		
 		//方法
 		methods: {
 			...mapMutations(['setUserInfo']),
@@ -364,9 +368,10 @@
 			},
 
 
-			onPageJump(url) {
+			onPageJump(url,name) {
+				console.log('点击了');
 				uni.navigateTo({
-					url: url
+					url: `${url}?name=${name}`
 				});
 			},
 			onInput() {
@@ -488,8 +493,7 @@
 						icon: 'none'
 					});
 					return;
-				}
-
+				}				
 				let httpData = {};
 				if (this.type == 2000) {
 					if (this.brand == 3000) {
@@ -539,6 +543,7 @@
 					this.$http
 						.get('book/user/registerOrLogin', httpData)
 						.then(res => {
+							this.submitClickNum = 0
 							res.userInfo.token = res.token.token;
 							this.setUserInfo(res.userInfo);
 							// socket.init();
@@ -546,15 +551,17 @@
 								title: '登录成功',
 								duration: 1000,
 							});
-
-
-
-
 							setTimeout(() => {
 								uni.switchTab({
 									url: '/pages/peanut/home'
 								});
 							}, 1000);
+						}).catch(e => {
+							uni.showToast({
+								title:'登陆失败',
+								icon:'none'
+							})
+							this.submitClickNum += 1
 						});
 				} else {
 					if (!this.phoneEmail) {
@@ -577,6 +584,7 @@
 					this.$http
 						.post('book/user/login', httpData)
 						.then(res => {
+							this.submitClickNum = 0
 							res.userInfo.token = res.token.token;
 							this.setUserInfo(res.userInfo);
 							// socket.init();
@@ -589,6 +597,12 @@
 									url: '/pages/peanut/home'
 								});
 							}, 1000);
+						}).catch(e => {
+							uni.showToast({
+								title:'登陆失败',
+								icon:'none'
+							})
+							this.submitClickNum += 1
 						});
 				}
 			},
@@ -839,7 +853,11 @@
 </script>
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
-
+	
+	.loginHelp{border: 1px solid #f5dab1; margin-top: 16rpx;  font-size: 26rpx; text-align: center; 
+	padding: 10rpx; background-color: #fdf6ec; border-radius: 15rpx;
+	.link{color: #e6a23c;}
+	}
 	.phoneNumberInput {
 		width: calc(100% - 160rpx);
 		// width: 100%;
diff --git a/pages/user/workOrder.vue b/pages/user/workOrder.vue
new file mode 100644
index 0000000..140f99b
--- /dev/null
+++ b/pages/user/workOrder.vue
@@ -0,0 +1,282 @@
+<template>
+	<view class="page">
+		<z-nav-bar></z-nav-bar>
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<view class="title">问题反馈</view>
+		<uni-forms :modelValue="form" :rules="rules" ref="form">
+			<view class="input_box " style="display: flex !important; align-items: center; ">
+				<uni-forms-item label="" name="type" label-width="0">
+					<view class="">
+						<text class="input_tit">反馈类型：</text>
+					</view>
+					<view class="in" style="flex: 1;">						
+							<!-- <input type="text" v-model="form.type" placeholder="请输入手机号/邮箱" />
+													 -->
+						<uni-data-select
+						      v-model="form.type"
+						      :localdata="questionTypeList"						     
+						    ></uni-data-select>
+					</view>
+				</uni-forms-item>
+			</view>
+			<view class="input_box">
+				<uni-forms-item label="" name="count" label-width="0">
+				<text class="input_tit">吴门医述账号:</text>
+				<view class="in">					
+						<input type="text" v-model="form.count" placeholder="请输入手机号/邮箱" />					
+				</view>
+				</uni-forms-item>
+			</view>
+			<view class="input_box">
+				<uni-forms-item label="" name="orderNum" label-width="0">
+				<text class="input_tit">订单编号:</text>
+				<view class="in">					
+					<input type="password" maxlength="8" v-model="form.orderNum" placeholder="请输入订单编号" />
+				</view>
+				</uni-forms-item>
+			</view>
+			<view class="input_box">
+				<uni-forms-item label="" name="note" label-width="0">
+				<text class="input_tit">问题描述:</text>
+				<view class="in">
+					<view class="uni-textarea">
+						
+						<textarea v-model="form.note" maxlength="200" placeholder="请输入您要反馈的问题" />
+						
+					</view>
+				</view>
+				</uni-forms-item>
+			</view>
+			<view class="input_box">
+				<text class="input_tit">问题截图:</text>
+				<view class="in">
+					<u-upload :fileList="fileList1" @afterRead="addPic" @delete="deletePic" multiple :maxCount="4"
+						width="40" height="40" :previewFullImage="true">
+					</u-upload>
+				</view>
+				<!-- <input type="password" maxlength="8" v-model="confirmPassword" placeholder="请确认密码" /> -->
+			</view>
+			<view class="input_box">
+				<uni-forms-item label="" name="tel" label-width="0">
+				<text class="input_tit">联系电话:</text>
+				<view class="in">
+					
+					<input type="text" v-model="form.tel" placeholder="请输入与您联系的手机号" />
+					
+				</view>
+				</uni-forms-item>
+			</view>
+		</uni-forms>
+		<view class="btn_box"><button @click="onSubmit">提 交</button></view>
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				fileList1: [],
+				playData: {},
+				questionTypeList:[
+					{}
+				],
+				//手机号账号
+				form: {
+					count: '', // 账号
+					note: '', // 描述
+					images: '', //图片
+					tel: '', // 联系电话
+					orderNum: '', // 订单号
+					type: null, // 反馈类型
+				},
+				rules: {
+					count: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入账户名',
+							}
+
+						]
+					},
+					note: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入问题描述',
+							}
+					
+						]
+					},
+					tel: {
+						rules: [{
+								required: true,
+								errorMessage: '请输入联系电话',
+							}
+					
+						]
+					},
+					type: {
+						rules: [{
+								required: true,
+								errorMessage: '请选择反馈类型',
+							}
+					
+						]
+					}
+				},
+			};
+		},
+		//第一次加载
+		onLoad(e) {},
+		//页面显示
+		onShow() {},
+
+		//方法
+		methods: {
+			addPic(e) {
+				console.log("添加图片");
+				let that = this;
+				for (var i = 0; i < e.file.length; i++) {
+					//console.log(i,e.file[i].url)
+					uni.uploadFile({
+						url: this.$baseUrl + "oss/fileoss",
+						filePath: e.file[i].url,
+						//files:e.file,
+						name: "file",
+						formData: {},
+						success: (res) => {
+							that.uploadPicLIst.push({
+								url: JSON.parse(res.data).url,
+							});
+							// this.showPicsList = true
+							console.log(that.uploadPicLIst, "that.uploadPicLIst");
+						},
+						fail: (error) => {
+							console.log("上传失败", error);
+						},
+					});
+				}
+			},
+			deletePic(val, i) {
+				console.log("删除图片");
+				this.uploadPicLIst.splice(i, 1);
+			},
+			onSubmit() {
+			this.$refs.form.validate().then(res=>{
+							console.log('表单数据信息：', res);
+						}).catch(err =>{
+							console.log('表单错误信息：', err);
+						})
+						return
+				this.$http
+					// .post('api/common/v1/forget_password', {
+					.post('book/user/setPassword', {
+						phone: this.phone,
+						code: this.code,
+						// password: md5(this.password),
+						password: this.password
+					})
+					.then(res => {
+						uni.showModal({
+							title: "提示",
+							content: "密码修改成功！",
+							showCancel: false,
+							success: (res) => {
+								uni.navigateBack();
+							}
+						});
+					});
+			}
+		},
+		//页面隐藏
+		onHide() {},
+		//页面卸载
+		onUnload() {},
+		//页面下来刷新
+		onPullDownRefresh() {},
+		//页面上拉触底
+		onReachBottom() {},
+		//用户点击分享
+		onShareAppMessage(e) {
+			return this.wxShare();
+		}
+	};
+</script>
+<style lang="scss" scoped>
+	@import '@/style/mixin.scss';
+
+	.page {
+		background-color: #ffffff;
+		padding: 0 65rpx;
+		min-height: 100vh;
+
+		.title {
+			padding: 60rpx 0 40rpx 0;
+			font-size: 60rpx;
+			color: #333333;
+		}
+
+		.input_box {
+			display: block;
+			// justify-content: space-between;
+			overflow: hidden;
+			// height: 100rpx;
+			padding-top: 10rpx;
+
+			// border-bottom: 1rpx solid #eeeeee;
+			align-items: center;
+
+			.in {
+				border: 1rpx solid #eeeeee;
+				border-radius: 20rpx;
+				padding: 8rpx;
+				margin-top: 10rpx;
+			}
+
+			text {
+				font-size: 30rpx;
+				width: 180rpx;
+			}
+
+			input {
+				flex: 1;
+				// height: 70rpx;
+				// line-height: 70rpx;
+				font-size: 30rpx;
+			}
+
+			button {
+				height: 78rpx;
+				line-height: 78rpx;
+				font-size: 30rpx;
+				color: $themeColor;
+
+				&:active {
+					background-color: transparent;
+				}
+			}
+		}
+
+		.btn_box {
+			margin-top: 70rpx;
+
+			button {
+				font-size: 32rpx;
+				@include theme('btn_bg') color: #fff;
+				height: 80rpx;
+				line-height: 80rpx;
+				border-radius: 50rpx;
+			}
+		}
+
+		.protocol {
+			font-size: 24rpx;
+			color: #999999;
+			text-align: center;
+			margin-top: 20rpx;
+
+			text {
+				color: $themeColor;
+			}
+		}
+	}
+</style>
\ No newline at end of file

From eefd8f4e830ac5dc12be6377b805052bde91db16 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Fri, 5 Jul 2024 13:14:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/baseUrl.js             |   5 +-
 pages/bookShop/orderLCont.vue |  10 +-
 pages/mine/mine/index.vue     |   8 +-
 pages/user/login.vue          |   5 +-
 pages/user/workOrder.vue      | 313 +++++++++++++++++++++++-----------
 5 files changed, 241 insertions(+), 100 deletions(-)

diff --git a/config/baseUrl.js b/config/baseUrl.js
index 8602990..4ed5682 100644
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -46,6 +46,8 @@ const courtConfig = {
 		// #endif
 	}
 };
+// 订单编号的正则
+const orderRegular = /[0-9]\d{31}$/;
 //手机号验证正则表达式
 // (中国大陆)
 const phoneRegular = /^1\d{10}$/;
@@ -59,5 +61,6 @@ const passwordRegular = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$/;
 export default Object.assign({
 	phoneRegular,
 	mailRegular,
-	passwordRegular
+	passwordRegular,
+	orderRegular
 }, courtConfig);
\ No newline at end of file
diff --git a/pages/bookShop/orderLCont.vue b/pages/bookShop/orderLCont.vue
index d11f3c6..c504a3b 100644
--- a/pages/bookShop/orderLCont.vue
+++ b/pages/bookShop/orderLCont.vue
@@ -286,8 +286,11 @@
 					<span style="color: #666;margin-right: 10rpx;float: left;">发货时间 : </span>
 					<text style="font-size: 24rpx;color: #666;">{{orderContet.shippingTime}}</text>
 				</view> -->
-          <view class=""></view>
+          
         </view>
+		<view class="" style="text-align: center; width: 100%;">
+					  <text @click="gotoWorkOrder" style="color: cadetblue; font-size: 26rpx;">订单有问题？去申诉</text>
+					  </view>
       </view>
     </view>
     <view class="goods_nav_box">
@@ -536,6 +539,11 @@ export default {
   },
 
   methods: {
+	  gotoWorkOrder(){
+		  uni.navigateTo({
+		  	url:`/pages/user/workOrder?name=order`
+		  })
+	  },
     async goBuyJie(data) {
       console.log("index at line 532:", data);
       if (data.text == "继续付款") {
diff --git a/pages/mine/mine/index.vue b/pages/mine/mine/index.vue
index 674cdd6..5e6064c 100644
--- a/pages/mine/mine/index.vue
+++ b/pages/mine/mine/index.vue
@@ -380,7 +380,7 @@ export default {
           url: "/pages/mine/aboutUs/index",
           type: "pageJump",
         },
-        //{ name: "设置", url: "/pages/mine/set/index", type: "pageJump" },
+        { name: "问题反馈/申诉", url: "/pages/user/workOrder", type: "workOrder" },
         // { name: "退出登录", type: "quitLogin" },
         // { name: "注销帐号", type: "loginOut" },
       ],
@@ -445,6 +445,12 @@ export default {
           //注销账号
           this.logout();
           break;
+		case "workOrder":
+		uni.navigateTo({
+			url:`${v.url}?name=userPage`
+		})
+		  // this.onPageJump(v.url);
+		  break;
       }
     },
     // 获得操作系统
diff --git a/pages/user/login.vue b/pages/user/login.vue
index 2f0fcd4..c921059 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -97,8 +97,9 @@
 				<button @click="onSubmit" class="active" v-if="btnShow">登 录</button>
 				<button v-else>登 录</button>
 			</view>
-			<view class="loginHelp" v-if="submitClickNum > 0">
-				<text>登陆遇到问题？</text><text class="link" @click="onPageJump('/pages/user/workOrder','login')">去反馈问题</text>
+			<!-- <view class="loginHelp" v-if="submitClickNum > 0"> -->
+			<view class="loginHelp">
+				<text>登录遇到问题？</text><text class="link" @click="onPageJump('/pages/user/workOrder','login')">去反馈问题</text>
 			</view>
 			<!-- <view class="password_register" style="margin: 0 auto; text-align: center; display: block;">
 				<button @click="onPageJump('/pages/user/register')">注册账号</button>
diff --git a/pages/user/workOrder.vue b/pages/user/workOrder.vue
index 140f99b..3557e29 100644
--- a/pages/user/workOrder.vue
+++ b/pages/user/workOrder.vue
@@ -3,115 +3,125 @@
 		<z-nav-bar></z-nav-bar>
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<view class="title">问题反馈</view>
+		<view class="title">问题反馈/申诉</view>
 		<uni-forms :modelValue="form" :rules="rules" ref="form">
-			<view class="input_box " style="display: flex !important; align-items: center; ">
+			<view class="input_box " style="">
 				<uni-forms-item label="" name="type" label-width="0">
 					<view class="">
-						<text class="input_tit">反馈类型：</text>
+						<text class="input_tit"><i>*</i>问题类型：</text>
 					</view>
-					<view class="in" style="flex: 1;">						
-							<!-- <input type="text" v-model="form.type" placeholder="请输入手机号/邮箱" />
+					<view class="in" style="flex: 1; border: none;">
+						<!-- <input type="text" v-model="form.type" placeholder="请输入手机号/邮箱" />
 													 -->
-						<uni-data-select
-						      v-model="form.type"
-						      :localdata="questionTypeList"						     
-						    ></uni-data-select>
+						<uni-data-select style="width: 100%;" v-model="form.type"
+							:localdata="typeLIst"></uni-data-select>
 					</view>
 				</uni-forms-item>
 			</view>
 			<view class="input_box">
-				<uni-forms-item label="" name="count" label-width="0">
-				<text class="input_tit">吴门医述账号:</text>
-				<view class="in">					
-						<input type="text" v-model="form.count" placeholder="请输入手机号/邮箱" />					
-				</view>
-				</uni-forms-item>
-			</view>
-			<view class="input_box">
-				<uni-forms-item label="" name="orderNum" label-width="0">
-				<text class="input_tit">订单编号:</text>
-				<view class="in">					
-					<input type="password" maxlength="8" v-model="form.orderNum" placeholder="请输入订单编号" />
-				</view>
-				</uni-forms-item>
-			</view>
-			<view class="input_box">
-				<uni-forms-item label="" name="note" label-width="0">
-				<text class="input_tit">问题描述:</text>
-				<view class="in">
-					<view class="uni-textarea">
-						
-						<textarea v-model="form.note" maxlength="200" placeholder="请输入您要反馈的问题" />
-						
+				<uni-forms-item label="" name="account" label-width="0">
+					<text class="input_tit"><i>*</i>吴门医述账号:</text>
+					<view class="in">
+						<input placeholder-style="font-size:26rpx" type="text" v-model="form.account"
+							placeholder="请输入手机号/邮箱" />
 					</view>
-				</view>
 				</uni-forms-item>
 			</view>
+			<view class="input_box" v-if="form.type == 3">
+				<uni-forms-item label="" name="relation" label-width="0">
+					<text class="input_tit"><i>*</i>订单编号:</text>
+					<view class="in">
+						<input type="number" @input="relationInput" placeholder-style="font-size:26rpx"
+							v-model="form.relation" placeholder="请输入订单编号" />
+					</view>
+					<text v-show="relationError" style="font-size: 24rpx; color: red; margin-top: 10rpx;">请填写订单编号</text>
+					<text v-show="relationErrorPattern"
+						style="font-size: 24rpx; color: red; margin-top: 10rpx;">订单编号格式错误</text>
+				</uni-forms-item>
+			</view>
+			<view class="input_box">
+				<uni-forms-item label="" name="content" label-width="0">
+					<text class="input_tit"><i>*</i>问题描述:</text>
+					<view class="in">
+						<view class="uni-textarea">
+							<textarea placeholder-style="font-size:26rpx" v-model="form.content" maxlength="200"
+								placeholder="请输入您要反馈的问题" />
+						</view>
+					</view>
+				</uni-forms-item>
+			</view>
+			<view class="input_box">
+				<uni-forms-item label="" name="contactInformation" label-width="0">
+					<text class="input_tit"><i>*</i>联系电话:</text>
+					{{reversedMessage}}
+					<view class="in">
+						<input type="number" placeholder-style="font-size:26rpx" @input="telInput"
+							v-model="form.contactInformation" placeholder="请输入与您联系的手机号" />
+					</view>
+					<text v-show="telError" style="font-size: 24rpx; color: red; margin-top: 10rpx;">手机号格式错误</text>
+				</uni-forms-item>
+			</view>
+
 			<view class="input_box">
 				<text class="input_tit">问题截图:</text>
-				<view class="in">
+				<view class="in" style="border: none;">
 					<u-upload :fileList="fileList1" @afterRead="addPic" @delete="deletePic" multiple :maxCount="4"
 						width="40" height="40" :previewFullImage="true">
 					</u-upload>
+					<text style="font-size: 24rpx; color: #999;">可上传4张问题截图</text>
 				</view>
 				<!-- <input type="password" maxlength="8" v-model="confirmPassword" placeholder="请确认密码" /> -->
 			</view>
-			<view class="input_box">
-				<uni-forms-item label="" name="tel" label-width="0">
-				<text class="input_tit">联系电话:</text>
-				<view class="in">
-					
-					<input type="text" v-model="form.tel" placeholder="请输入与您联系的手机号" />
-					
-				</view>
-				</uni-forms-item>
-			</view>
 		</uni-forms>
 		<view class="btn_box"><button @click="onSubmit">提 交</button></view>
 	</view>
 </template>
 <script>
+	import $http from '@/config/requestConfig.js';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
 	export default {
 		data() {
 			return {
 				fileList1: [],
 				playData: {},
-				questionTypeList:[
-					{}
-				],
 				//手机号账号
 				form: {
-					count: '', // 账号
-					note: '', // 描述
-					images: '', //图片
-					tel: '', // 联系电话
-					orderNum: '', // 订单号
+					account: '', // 账号
+					content: '', // 描述
+					image: '', //图片
+					contactInformation: '', // 联系电话
+					relation: '', // 订单号
 					type: null, // 反馈类型
 				},
+				telError: false,
+				relationError: false,
+				relationErrorPattern:false,
 				rules: {
-					count: {
+					account: {
 						rules: [{
 								required: true,
-								errorMessage: '请输入账户名',
+								errorMessage: '请输入账号',
 							}
 
 						]
 					},
-					note: {
+					content: {
 						rules: [{
 								required: true,
 								errorMessage: '请输入问题描述',
 							}
-					
+
 						]
 					},
-					tel: {
+					contactInformation: {
 						rules: [{
 								required: true,
 								errorMessage: '请输入联系电话',
 							}
-					
+
 						]
 					},
 					type: {
@@ -119,21 +129,86 @@
 								required: true,
 								errorMessage: '请选择反馈类型',
 							}
-					
+
 						]
 					}
 				},
+				pageType: '',
+				typeLIst: [
+					// { value: 0, text: "请选择" },
+					{
+						value: 1,
+						text: "登陆相关问题"
+					},
+					{
+						value: 2,
+						text: "账号相关问题"
+					},
+					{
+						value: 3,
+						text: "订单相关问题"
+					},
+					{
+						value: 4,
+						text: "购买相关问题"
+					},
+					{
+						value: 5,
+						text: "VIP相关问题"
+					},
+					{
+						value: 6,
+						text: "充值相关问题"
+					},
+					{
+						value: 7,
+						text: "网络暴力举报"
+					},
+					{
+						value: 8,
+						text: "其他"
+					},
+				],
 			};
 		},
 		//第一次加载
-		onLoad(e) {},
-		//页面显示
-		onShow() {},
+		onLoad(e) {
+			console.log('收到的值', e);
+			this.pageType = e.name
+			switch (this.pageType) {
+				case "login":
+					this.form.type = 1
+					break;
 
+				case "order":
+					this.form.type = 3
+					break;
+			}
+
+		},
+		//页面显示
+		onShow() {
+
+		},
+		computed: {
+			...mapState(['userInfo']),
+			reversedMessage: function() {
+				// `this` 指向 vm 实例
+				this.form.account = this.userInfo.tel
+			}
+		},
 		//方法
 		methods: {
+			relationInput(e) {
+				this.relationError = false
+				this.relationErrorPattern = false
+			},
+			telInput(e) {
+				// console.log('键盘输入',e);
+				this.telError = false
+			},
 			addPic(e) {
-				console.log("添加图片");
+				// console.log("添加图片");
 				let that = this;
 				for (var i = 0; i < e.file.length; i++) {
 					//console.log(i,e.file[i].url)
@@ -144,11 +219,10 @@
 						name: "file",
 						formData: {},
 						success: (res) => {
-							that.uploadPicLIst.push({
+							that.fileList1.push({
 								url: JSON.parse(res.data).url,
-							});
-							// this.showPicsList = true
-							console.log(that.uploadPicLIst, "that.uploadPicLIst");
+							});							
+							console.log(that.fileList1, "that.uploadPicLIst");
 						},
 						fail: (error) => {
 							console.log("上传失败", error);
@@ -156,35 +230,76 @@
 					});
 				}
 			},
-			deletePic(val, i) {
-				console.log("删除图片");
-				this.uploadPicLIst.splice(i, 1);
+			deletePic(event) {
+				this.fileList1.splice(event.index, 1)
 			},
 			onSubmit() {
-			this.$refs.form.validate().then(res=>{
-							console.log('表单数据信息：', res);
-						}).catch(err =>{
-							console.log('表单错误信息：', err);
-						})
-						return
-				this.$http
-					// .post('api/common/v1/forget_password', {
-					.post('book/user/setPassword', {
-						phone: this.phone,
-						code: this.code,
-						// password: md5(this.password),
-						password: this.password
-					})
-					.then(res => {
-						uni.showModal({
-							title: "提示",
-							content: "密码修改成功！",
-							showCancel: false,
-							success: (res) => {
-								uni.navigateBack();
+				this.$refs.form.validate().then(res => {					
+					if (this.form.type == 3) {
+						if (this.form.relation == '') {
+							this.relationError = true
+							return
+						} else {
+							if (!this.$base.orderRegular.test(this.form.relation)) {
+								this.relationErrorPattern = true
+								return
 							}
+						}
+					}
+					if (this.fileList1.length > 0) {
+						let _list = this.fileList1
+						_list = _list.map(item => item.url)
+						// console.log('this.fileList1',_list);
+						this.form.image = _list.join(',')
+					}
+					if (!this.$base.phoneRegular.test(this.form.contactInformation)) {
+						this.telError = true
+						uni.showToast({
+							title: '手机格式不正确',
+							icon: 'none'
 						});
-					});
+						return;
+					}
+					// console.log('this.fileList1',this.form.image);			
+					$http.request({
+							url: "common/sysFeedback/addSysFeedback",
+							method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+							data: {
+								...this.form
+							},
+							header: { //默认 无 说明：请求头
+								'Content-Type': 'application/json'
+							},
+						})
+						.then(res => {
+							uni.showModal({
+								title: "提示",
+								content: "提交成功！",
+								showCancel: false,
+								success: (res) => {
+									this.fileList1 = []
+									// this.$nextTick(() => {
+										uni.navigateBack({
+											delta: 1
+										});	
+									// })
+
+								}
+							});
+						}).catch(e => {
+					// console.log('表单错误信息：', err);
+					uni.showToast({
+						title: '提交失败',
+						icon: 'error'
+					})
+				});
+				}).catch(err => {
+					console.log('表单错误信息：', err);
+					uni.showToast({
+						title: '页面有未填写的内容哦',
+						icon: 'none'
+					})
+				})
 			}
 		},
 		//页面隐藏
@@ -218,16 +333,22 @@
 		.input_box {
 			display: block;
 			// justify-content: space-between;
-			overflow: hidden;
+			// overflow: hidden;
 			// height: 100rpx;
 			padding-top: 10rpx;
 
 			// border-bottom: 1rpx solid #eeeeee;
 			align-items: center;
 
+			i {
+				font-size: 24rpx;
+				color: red;
+				padding-right: 10rpx;
+			}
+
 			.in {
 				border: 1rpx solid #eeeeee;
-				border-radius: 20rpx;
+				border-radius: 8rpx;
 				padding: 8rpx;
 				margin-top: 10rpx;
 			}
@@ -238,8 +359,9 @@
 			}
 
 			input {
+
 				flex: 1;
-				// height: 70rpx;
+				height: 50rpx;
 				// line-height: 70rpx;
 				font-size: 30rpx;
 			}
@@ -258,6 +380,7 @@
 
 		.btn_box {
 			margin-top: 70rpx;
+			padding-bottom: 20rpx;
 
 			button {
 				font-size: 32rpx;