3.1.4

U:修改实名认证规则

packageA/buyService/buyService.js

@@ -329,7 +329,8 @@ Page({
         })
         return;
       } else {
-        if (that.data.idType == 1) {
+        //非大陆和新疆不走验证
+        if (that.data.idType == 1||that.data.idCard.substring(0,2)=='65') {
           that.servicePay();
         } else {
           Util.verifyIdCardAnName(that.data.name, that.data.idCard, res => {

packageA/editPatientInfo/editPatientInfo.js

@@ -358,7 +358,89 @@ Page({
 			})
 			return;
 		} else if (that.data.idCard != '') {
-			if (that.data.idType == 0) {
+			if (that.data.idType == 1 || that.data.idCard.substring(0, 2) == '65') {
+				var allData = wx.getStorageSync("data");
+				var data
+				if (that.data.id == '') {
+					data = {
+						unionid: allData.unionid,
+						name: that.data.name,
+						phone: that.data.phone,
+						age: that.data.age,
+						card: that.data.idCard,
+						idType: that.data.idType,
+						sex: that.data.SEXstate == 0 ? '男' : '女',
+						birthday: that.data.date,
+						weight: that.data.weight,
+						allergy: that.data.GMSstate,
+						allergy_desc: that.data.GMStext,
+						past: that.data.GWBSstate,
+						past_desc: that.data.GWBStext,
+						liver: that.data.GGNstate,
+						kidney: that.data.SGNstate,
+						beiyun: that.data.SEXstate == 1 ? that.data.BYQKstate : '0'
+					}
+					Service.addUserBuyInfo(data).then((res) => {
+						if (res.code == 1) {
+							var pages = getCurrentPages();
+							var currPage = pages[pages.length - 1]; //当前页面
+							var prevPage = pages[pages.length - 2]; //上一个页面
+							prevPage.setData({ // 这里是需要传递的参数值
+								item: ''
+							})
+							wx.navigateBack({
+								delta: 1
+							})
+						} else {
+							wx.showModal({
+								title: '提示',
+								content: res.msg,
+								showCancel: false,
+							})
+						}
+					})
+				} else {
+					data = {
+						id: that.data.id,
+						unionid: allData.unionid,
+						name: that.data.name,
+						phone: that.data.phone,
+						age: that.data.age,
+						card: that.data.idCard,
+						idType: that.data.idType,
+						sex: that.data.SEXstate == 0 ? '男' : '女',
+						birthday: that.data.date,
+						weight: that.data.weight,
+						allergy: that.data.GMSstate,
+						allergy_desc: that.data.GMStext,
+						past: that.data.GWBSstate,
+						past_desc: that.data.GWBStext,
+						liver: that.data.GGNstate,
+						kidney: that.data.SGNstate,
+						beiyun: that.data.SEXstate == 1 ? that.data.BYQKstate : '0'
+					}
+					Service.editUserBuyInfo(data).then((res) => {
+						if (res.code == 1) {
+							var pages = getCurrentPages();
+							console.log('pages', pages);
+							var currPage = pages[pages.length - 1]; //当前页面
+							var prevPage = pages[pages.length - 2]; //上一个页面
+							prevPage.setData({ // 这里是需要传递的参数值
+								item: data
+							})
+							wx.navigateBack({
+								delta: 1
+							})
+						} else {
+							wx.showModal({
+								title: '提示',
+								content: res.msg,
+								showCancel: false,
+							})
+						}
+					})
+				}
+			} else {
 				Util.verifyIdCardAnName(that.data.name, that.data.idCard, res => {
 					switch (res.code) {
 						case 0:
@@ -461,88 +543,7 @@ Page({
 							return;
 					}
 				})
-			} else {
-				var allData = wx.getStorageSync("data");
-				var data
-				if (that.data.id == '') {
-					data = {
-						unionid: allData.unionid,
-						name: that.data.name,
-						phone: that.data.phone,
-						age: that.data.age,
-						card: that.data.idCard,
-						idType: that.data.idType,
-						sex: that.data.SEXstate == 0 ? '男' : '女',
-						birthday: that.data.date,
-						weight: that.data.weight,
-						allergy: that.data.GMSstate,
-						allergy_desc: that.data.GMStext,
-						past: that.data.GWBSstate,
-						past_desc: that.data.GWBStext,
-						liver: that.data.GGNstate,
-						kidney: that.data.SGNstate,
-						beiyun: that.data.SEXstate == 1 ? that.data.BYQKstate : '0'
-					}
-					Service.addUserBuyInfo(data).then((res) => {
-						if (res.code == 1) {
-							var pages = getCurrentPages();
-							var currPage = pages[pages.length - 1]; //当前页面
-							var prevPage = pages[pages.length - 2]; //上一个页面
-							prevPage.setData({ // 这里是需要传递的参数值
-								item: ''
-							})
-							wx.navigateBack({
-								delta: 1
-							})
-						} else {
-							wx.showModal({
-								title: '提示',
-								content: res.msg,
-								showCancel: false,
-							})
-						}
-					})
-				} else {
-					data = {
-						id: that.data.id,
-						unionid: allData.unionid,
-						name: that.data.name,
-						phone: that.data.phone,
-						age: that.data.age,
-						card: that.data.idCard,
-						idType: that.data.idType,
-						sex: that.data.SEXstate == 0 ? '男' : '女',
-						birthday: that.data.date,
-						weight: that.data.weight,
-						allergy: that.data.GMSstate,
-						allergy_desc: that.data.GMStext,
-						past: that.data.GWBSstate,
-						past_desc: that.data.GWBStext,
-						liver: that.data.GGNstate,
-						kidney: that.data.SGNstate,
-						beiyun: that.data.SEXstate == 1 ? that.data.BYQKstate : '0'
-					}
-					Service.editUserBuyInfo(data).then((res) => {
-						if (res.code == 1) {
-							var pages = getCurrentPages();
-							console.log('pages', pages);
-							var currPage = pages[pages.length - 1]; //当前页面
-							var prevPage = pages[pages.length - 2]; //上一个页面
-							prevPage.setData({ // 这里是需要传递的参数值
-								item: data
-							})
-							wx.navigateBack({
-								delta: 1
-							})
-						} else {
-							wx.showModal({
-								title: '提示',
-								content: res.msg,
-								showCancel: false,
-							})
-						}
-					})
-				}
+
 			}
 		} else {
 			var allData = wx.getStorageSync("data");

packageA/editUser/editUser.js

@@ -364,7 +364,116 @@ Page({
 			})
 			return;
 		} else if (that.data.idCard != '') {
-			if (that.data.idType == 0) {
+			if (that.data.idType == 1 || that.data.idCard.substring(0, 2) == '65') {
+				var allData = wx.getStorageSync("data");
+				var data
+				if (that.data.id == '') {
+					data = {
+						unionid: allData.unionid,
+						name: that.data.name,
+						phone: that.data.phone,
+						age: that.data.age,
+						card: that.data.idCard,
+						idType: that.data.idType,
+						sex: that.data.SEXstate == 0 ? '男' : '女',
+						birthday: that.data.date,
+						weight: that.data.weight,
+						allergy: that.data.GMSstate,
+						allergy_desc: that.data.GMStext,
+						past: that.data.GWBSstate,
+						past_desc: that.data.GWBStext,
+						liver: that.data.GGNstate,
+						kidney: that.data.SGNstate,
+						beiyun: that.data.SEXstate == 1 ? that.data.BYQKstate : '0'
+					}
+					Service.addUserBuyInfo(data).then((res) => {
+						if (res.code == 1) {
+							if (that.data.needIdCard == 1) {
+								var pages = getCurrentPages();
+								var prevPage = pages[pages.length - 3]; //上上一个页面
+								prevPage.setData({ // 这里是需要传递的参数值
+									item: ''
+								})
+								wx.navigateBack({
+									delta: 2
+								})
+								that.setData({
+									sava: true
+								})
+							} else {
+								wx.navigateBack({
+									delta: 1
+								})
+								that.setData({
+									sava: true
+								})
+							}
+						} else {
+							wx.showModal({
+								title: '提示',
+								content: res.msg,
+								showCancel: false,
+							})
+							that.setData({
+								sava: true
+							})
+						}
+					})
+				} else {
+					data = {
+						id: that.data.id,
+						unionid: allData.unionid,
+						name: that.data.name,
+						phone: that.data.phone,
+						age: that.data.age,
+						card: that.data.idCard,
+						idType: that.data.idType,
+						sex: that.data.SEXstate == 0 ? '男' : '女',
+						birthday: that.data.date,
+						weight: that.data.weight,
+						allergy: that.data.GMSstate,
+						allergy_desc: that.data.GMStext,
+						past: that.data.GWBSstate,
+						past_desc: that.data.GWBStext,
+						liver: that.data.GGNstate,
+						kidney: that.data.SGNstate,
+						beiyun: that.data.SEXstate == 1 ? that.data.BYQKstate : '0'
+					}
+					Service.editUserBuyInfo(data).then((res) => {
+						if (res.code == 1) {
+							if (that.data.needIdCard == 1) {
+								var pages = getCurrentPages();
+								var prevPage = pages[pages.length - 3]; //上上一个页面
+								prevPage.setData({ // 这里是需要传递的参数值
+									item: data
+								})
+								wx.navigateBack({
+									delta: 2
+								})
+								that.setData({
+									sava: true
+								})
+							} else {
+								wx.navigateBack({
+									delta: 1
+								})
+								that.setData({
+									sava: true
+								})
+							}
+						} else {
+							wx.showModal({
+								title: '提示',
+								content: res.msg,
+								showCancel: false,
+							})
+							that.setData({
+								sava: true
+							})
+						}
+					})
+				}
+			} else {
 				Util.verifyIdCardAnName(that.data.name, that.data.idCard, res => {
 					switch (res.code) {
 						case 0:
@@ -494,115 +603,6 @@ Page({
 							return;
 					}
 				})
-			} else {
-				var allData = wx.getStorageSync("data");
-				var data
-				if (that.data.id == '') {
-					data = {
-						unionid: allData.unionid,
-						name: that.data.name,
-						phone: that.data.phone,
-						age: that.data.age,
-						card: that.data.idCard,
-						idType: that.data.idType,
-						sex: that.data.SEXstate == 0 ? '男' : '女',
-						birthday: that.data.date,
-						weight: that.data.weight,
-						allergy: that.data.GMSstate,
-						allergy_desc: that.data.GMStext,
-						past: that.data.GWBSstate,
-						past_desc: that.data.GWBStext,
-						liver: that.data.GGNstate,
-						kidney: that.data.SGNstate,
-						beiyun: that.data.SEXstate == 1 ? that.data.BYQKstate : '0'
-					}
-					Service.addUserBuyInfo(data).then((res) => {
-						if (res.code == 1) {
-							if (that.data.needIdCard == 1) {
-								var pages = getCurrentPages();
-								var prevPage = pages[pages.length - 3]; //上上一个页面
-								prevPage.setData({ // 这里是需要传递的参数值
-									item: ''
-								})
-								wx.navigateBack({
-									delta: 2
-								})
-								that.setData({
-									sava: true
-								})
-							} else {
-								wx.navigateBack({
-									delta: 1
-								})
-								that.setData({
-									sava: true
-								})
-							}
-						} else {
-							wx.showModal({
-								title: '提示',
-								content: res.msg,
-								showCancel: false,
-							})
-							that.setData({
-								sava: true
-							})
-						}
-					})
-				} else {
-					data = {
-						id: that.data.id,
-						unionid: allData.unionid,
-						name: that.data.name,
-						phone: that.data.phone,
-						age: that.data.age,
-						card: that.data.idCard,
-						idType: that.data.idType,
-						sex: that.data.SEXstate == 0 ? '男' : '女',
-						birthday: that.data.date,
-						weight: that.data.weight,
-						allergy: that.data.GMSstate,
-						allergy_desc: that.data.GMStext,
-						past: that.data.GWBSstate,
-						past_desc: that.data.GWBStext,
-						liver: that.data.GGNstate,
-						kidney: that.data.SGNstate,
-						beiyun: that.data.SEXstate == 1 ? that.data.BYQKstate : '0'
-					}
-					Service.editUserBuyInfo(data).then((res) => {
-						if (res.code == 1) {
-							if (that.data.needIdCard == 1) {
-								var pages = getCurrentPages();
-								var prevPage = pages[pages.length - 3]; //上上一个页面
-								prevPage.setData({ // 这里是需要传递的参数值
-									item: data
-								})
-								wx.navigateBack({
-									delta: 2
-								})
-								that.setData({
-									sava: true
-								})
-							} else {
-								wx.navigateBack({
-									delta: 1
-								})
-								that.setData({
-									sava: true
-								})
-							}
-						} else {
-							wx.showModal({
-								title: '提示',
-								content: res.msg,
-								showCancel: false,
-							})
-							that.setData({
-								sava: true
-							})
-						}
-					})
-				}
 			}
 		} else {
 			var allData = wx.getStorageSync("data");