Merge branch 'dev-f' into 'main'

fix：修改意见反馈，qq验证

See merge request huang/thingskit-app!52

 /**
  * 需要修改
  */
-const APPID = 'wxd5d018355f38262b'
-const APPSECRECT = 'f6975fcc2248b1de2fdd2e40e9d21476'
+const APPID = 'wx99c411dc3c5571ef'
+const APPSECRECT = '606153abd59308b20a6e41fb6c852ad2'
 
 module.exports = {
 	appId: APPID,

@@ -116,12 +116,35 @@ export default {
 					},
 					{
 						validator: (rule, value, callback) => {
-							return uni.$u.test.mobile(value);
+							const pattern=/^[0-11]*$/g
+							if(pattern.test(value)){
+							}else{
+								return uni.$u.toast('手机号只能是数字且为11位数')
+							}
 						},
 						message: '手机号码不正确',
 						trigger: ['change', 'blur']
 					}
 				],
+				'feedbackInfo.qq': [
+					{
+						type: 'number',
+						required: true,
+						message: '请填写qq号码',
+						trigger: ['blur', 'change']
+					},
+					{
+						validator: (rule, value, callback) => {
+							const pattern=/^[0-10]*$/g
+							if(pattern.test(value)){
+							}else{
+								return uni.$u.toast('qq号只能是数字')
+							}
+						},
+						message: 'qq号码不正确',
+						trigger: ['change', 'blur']
+					}
+				],
 				'feedbackInfo.email': [
 					{
 						type: 'string',
@@ -131,7 +154,7 @@ export default {
 					},
 					{
 						validator: (rule, value, callback) => {
-							return uni.$u.test.email(value);
+								return uni.$u.test.email(value);
 						},
 						message: '邮箱不正确',
 						trigger: ['change', 'blur']

 {
-    "name" : "yun-teng-app",
-    "appid" : "__UNI__C873643",
-    "description" : "thingskit小程序",
-    "versionName" : "1.0.0",
-    "versionCode" : 100,
-    "transformPx" : false,
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        "modules" : {},
-        "distribute" : {
-            "android" : {
-                "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            "ios" : {},
-            "sdkConfigs" : {
-                "ad" : {},
-                "geolocation" : {
-                    "system" : {
-                        "__platform__" : [ "ios", "android" ]
-                    },
-                    "amap" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appkey_ios" : "",
-                        "appkey_android" : ""
-                    }
-                },
-                "maps" : {}
-            }
-        }
-    },
-    "quickapp" : {},
-    "mp-weixin" : {
-        "appid" : "wxd5d018355f38262b",
-        "setting" : {
-            "urlCheck" : false,
-            "minified" : true,
-            "es6" : true,
-            "postcss" : true
-        },
-        "usingComponents" : true,
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
-            }
-        },
-        "lazyCodeLoading" : "requiredComponents",
-        //开启分包优化
-        "optimization" : {
-            "subPackages" : true
-        }
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "vueVersion" : "2",
-    "h5" : {
-        "sdkConfigs" : {
-            "maps" : {}
-        },
-        "router" : {
-            "base" : "minImage/h5/"
-        }
-    }
+	"name": "yun-teng-app",
+	"appid": "__UNI__C873643",
+	"description": "thingskit小程序",
+	"versionName": "1.0.0",
+	"versionCode": 100,
+	"transformPx": false,
+	"app-plus": {
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		"modules": {},
+		"distribute": {
+			"android": {
+				"permissions": [
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				]
+			},
+			"ios": {},
+			"sdkConfigs": {
+				"ad": {},
+				"geolocation": {
+					"system": {
+						"__platform__": ["ios", "android"]
+					},
+					"amap": {
+						"__platform__": ["ios", "android"],
+						"appkey_ios": "",
+						"appkey_android": ""
+					}
+				},
+				"maps": {}
+			}
+		}
+	},
+	"quickapp": {},
+	"mp-weixin": {
+		"appid": "wx99c411dc3c5571ef",
+		"setting": {
+			"urlCheck": false,
+			"minified": false,
+			"es6": true,
+			"postcss": true
+		},
+		"usingComponents": true,
+		"permission": {
+			"scope.userLocation": {
+				"desc": "你的位置信息将用于小程序位置接口的效果展示"
+			}
+		},
+		"lazyCodeLoading": "requiredComponents",
+		//开启分包优化
+		"optimization": {
+			"subPackages": true
+		}
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"uniStatistics": {
+		"enable": false
+	},
+	"vueVersion": "2",
+	"h5": {
+		"sdkConfigs": {
+			"maps": {}
+		},
+		"router": {
+			"base": "minImage/h5/"
+		}
+	}
 }