Merge branch 'master' of http://192.168.40.220/dmc/jz_applet

applyCard/choice-product.vue

@@ -109,6 +109,7 @@
 			method: "POST",
 			showLoading: true,
 		};
+		console.log('输出内容',options.data)
 		request(etcQueryProduct, options).then((res) => {
 			console.log(res.bizContent);
 			const data = stringToJson(res.bizContent);

pages/index/index.vue

@@ -391,24 +391,14 @@
 	const toCreatOrder = (val: any) => {
 		state.userType = val;
 		if (val === "1") {
-			// navTo(`/applyCard/essential-information?type=${state.type}&&userType=${state.userType}`, true)
 			navTo(`/applyCard/essential-information?type=${state.type}&&userType=${state.userType}`)
-			// uni.navigateTo({
-			// 	url: `/applyCard/essential-information?type=${state.type}&&userType=${state.userType}`,
-			// });
 		} else {
-			// uni.navigateTo({
-			// 	url: `/applyCard/essential-information?type=${state.type}&&userType=${state.userType}`,
-			// });
-			// navTo(`/applyCard/essential-information?type=${state.type}&&userType=${state.userType}`, true)
 			navTo(`/applyCard/essential-information?type=${state.type}&&userType=${state.userType}`)
 		}
 		closeMask();
 	};
 
 	const showMask = (val: any) => {
-		// console.log(88888888888888);
-		// console.log(getItem("token"));
 		// if (getItem("token") != '' || getItem("openId") != '') {
 		// 	state.type = val;
 		// 	isShowMask.value = true;
@@ -460,9 +450,6 @@
 	}
 </style>
 <style lang="scss" scoped>
-	// .wrapper {
-	// 	background: #eef7f7;
-	// }
 	.statusBar {
 		width: 100%;
 		position: sticky;

utils/network/encryption.js

@@ -160,12 +160,15 @@ function textToBase64(text, key, iv) {
 export function encryption(ifCode, subdata, type) {
 	var requestData = new Array();
 	requestData["ifCode"] = ifCode;
-	requestData["appId"] = "52030131"; // || "admin001"
+	// requestData["appId"] = "52030131"; // || "admin001"
+	requestData["appId"] = "admin001"; // || "admin001"
 	requestData["signType"] = "MD5"; // || "NONE"
-	requestData["encryptType"] = "SM4";
+	// requestData["encryptType"] = "SM4";
+	requestData["encryptType"] = "NONE";
 	requestData["reqId"] = requestData["appId"] + "_" + getDate() + "_" + generateMixed(5);
 	requestData["timestamp"] = formatTime(new Date());
-	requestData["bizContent"] = s4.encryptData_CBC(subdata, sm4Key)
+	// requestData["bizContent"] = s4.encryptData_CBC(subdata, sm4Key)
+	requestData["bizContent"] = JSON.stringify(subdata)
 	requestData["sign"] = md5(
 		"bizContent=" + requestData["bizContent"] +
 		"&signType=" + requestData["signType"] +

utils/network/request.js

@@ -99,8 +99,9 @@ export function request(code, options = {}) {
 				reject(res.data.errorMsg)
 				return
 			}
-
-			let content = s4.decryptData_CBC(res, sm4Key)
+			
+			let content = res
+			// let content = s4.decryptData_CBC(res, sm4Key)
 			// console.log(content);
 			// content.data.bizContent = JSON.stringify(content.data.bizContent)
 			// console.log(content.data);