Merge remote-tracking branch 'origin/master'

pages.json

@@ -322,6 +322,36 @@
 			}
 		},
 		{
+			"path": "pages/asking/asking",
+			"style": {
+				"usingComponents": {},
+				"navigationBarBackgroundColor": "#07c160",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "问吧"
+
+			}
+		},
+		{
+			"path": "pages/me/nameAuthentication",
+			"style": {
+				"usingComponents": {},
+				"navigationBarBackgroundColor": "#07c160",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "实名认证"
+
+			}
+		},
+		{
+			"path": "pages/me/officialAuthentication",
+			"style": {
+				"usingComponents": {},
+				"navigationBarBackgroundColor": "#07c160",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "官方认证"
+
+			}
+		},
+		{
 			"path": "pages/me/meOperate",
 			"style": {
 				"usingComponents": {},

pages/me/me.vue

@@ -109,7 +109,7 @@ export default {
 			getUserInfo(userId).then(res =>{
 				this.initInfo.wechatName = res.data.wechatName;
 				this.initInfo.name = res.data.name;
-				this.initInfo.wechatName = res.data.wechatName;
+				this.initInfo.headImg = res.data.headImg;
 			})
 		},
 		//获取当前积分

pages/me/nameAuthentication.vue

@@ -83,12 +83,18 @@
             },
             /** 提交按钮 */
             submitForm(e) {
-                this.$refs[e].validate().then(res => {
-                    appletAdd(this.form).then(res => {
-						uni.navigateBack();
-					});
-                }).catch(err => {
-                })
+				this.$refs[e].validate().then(res => {
+					if(this.imageList.length!=2){
+						uni.showToast({
+							title: "身份证正反面照片为两张！",
+							icon: "none"
+						})
+					}else{
+						appletAdd(this.form).then(res => {
+							uni.navigateBack();
+						});
+					}
+				})
             },
 
             updateImg(imgList) {

pages/me/officialAuthentication.vue

@@ -13,7 +13,7 @@
                     <uni-easyinput v-model="form.phone" placeholder="请输入联系电话" maxlength="13"/>
                 </uni-forms-item>
                 <uni-forms-item label="证照信息" required name="path">
-                    <upload :imgArr="imageList" name="path" v-model="form.path" :fileSize="1" :limit="3"
+                    <upload :imgArr="imageList" name="path" v-model="form.path" :fileSize="1" :limit="2"
                             @updateImg="updateImg"></upload>
                 </uni-forms-item>
             </uni-forms>
@@ -79,14 +79,22 @@
             },
             /** 提交按钮 */
             submitForm(e) {
-                this.$refs[e].validate().then(res => {
-					appletAdd(this.form).then(res => {
-						uni.navigateBack();
-					})
-                }).catch(err => {
-                    console.log('err', err);
-                })
+				this.$refs[e].validate().then(res => {
+					if(this.imageList.length!=2){
+						uni.showToast({
+							title: "证照信息照片为两张！",
+							icon: "none"
+						})
+					}else{
+						appletAdd(this.form).then(res => {
+							console.log("1111111111")
+							uni.navigateBack();
+							console.log("2222222222222")
+						});
+					}
+				})
             },
+			
             updateImg(imgList) {
                 this.imageList = imgList;
                 this.form.path = this.imageList.join(',');