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

pages/index/index.vue

@@ -1,5 +1,6 @@
 <template>
 	<navBar title="首页" :scrollTop="scrollTop" :isBack="isBack"></navBar>
+	<!-- <web-view src="https://qtzl.etcjz.cn/h5/#/pages/productSelection/productSelection?qdOrderNo=20231129210008520101000026149316"></web-view> -->
 	<filter>
 		<!-- <view class="statusBar" :style="{height:statusBarHeight+'px'}" v-show="isShowBar"></view> -->
 		<view class="wrapper">

pages/zaweb/zaweb.vue

@@ -15,6 +15,7 @@
 	// #ifdef MP-ALIPAY
 	// url.value = 'https://qtzl.etcjz.cn/wxOrder/#/pages/backPage/backPage?type=3'
 	url.value = 'https://qtzl.etcjz.cn/aliOrder/'
+	// url.value = 'https://qtzl.etcjz.cn/h5/#/pages/productSelection/productSelection?qdOrderNo=20231129210008520101000026149316'
 	// #endif
 </script>
 <style lang='scss' scoped>

utils/network/api.js

@@ -30,9 +30,9 @@ export const aliPayConfigId = "6a9a54bc01f6443123452b1234"; //支付配置编号
 export const aliPayConfigIdTwo = "6a9a54bc01f644312543761234";
 export const wechatAppID = "wx8fba957179c1329a"; //九州小程序APPid:wx008c60533388527a 
 export const wechatSecret = "699c10826113ddb350fbe58a96e2b015"; //九州小程序AppSecret:95197718b43b497f02732bd9f8011080
-// export const sm4Key =
-// 	"5dc11f854ceca1473e1a5075ed16eb226b4543a9a05fe50f7fba40f898099ce34abba69a07a20509f315f94d808a4d0e988935588858f65a";
-export const sm4Key = "5dc11f854ceca147";
+export const sm4Key = "5dc11f854ceca1473e1a5075ed16eb226b4543a9a05fe50f7fba40f898099ce34abba69a07a20509f315f94d808a4d0e988935588858f65a";
+// export const sm4Key = "5dc11f854ceca147";
+
 
 //字典
 export const queryKey = 'cefb3b5da25a49eeb18865c00bc91c96' //全量KEY

utils/network/encryption.js

@@ -13,14 +13,13 @@ import {
 import {
 	sm4Key
 } from "../network/api.js";
-import {
-	SM4Util
-} from '../util/sm4.js'
+import SM4Util from '../util/sm4.js'
 import {
 	getItem,
 	StorageKeys
 } from "@/utils/storage";
 const s4 = new SM4Util()
+console.log('SM4===',s4)
 
 const _signCode = "etc123456"; //签名码
 
@@ -197,15 +196,15 @@ export function encryption(ifCode, subdata, type) {
 	var requestData = new Array();
 	const key = 'WVdSdGFXNHdNREZmTWpBeU16QTRNRE09'
 	requestData["ifCode"] = ifCode;
-	// requestData["appId"] = "52030131"; // || "admin001"
-	requestData["appId"] = "admin001"; // || "admin001"
-	requestData["signType"] = "SM3"; // || "NONE"
-	// requestData["encryptType"] = "SM4";
+	requestData["appId"] = "52030131"; // || "admin001"
+	// requestData["appId"] = "admin001"; // || "admin001"
+	// requestData["signType"] = "SM3"; // || "NONE"
+	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"] = JSON.stringify(subdata)
+	requestData["bizContent"] = s4.encryptData_CBC(subdata, sm4Key)
+	// requestData["bizContent"] = JSON.stringify(subdata)
 	requestData["accessToken"] = getItem(StorageKeys.Token)
 	requestData["sign"] = sm3(
 		"appId=" + requestData["appId"] +
@@ -217,6 +216,7 @@ export function encryption(ifCode, subdata, type) {
 		"&reqId=" + requestData["reqId"] +
 		"&accessToken=" + requestData["accessToken"], key
 	);
+	console.log('requestData：',requestData)
 	let endData = arrayToJson(requestData);
 	return endData;
 }

utils/network/request.js

@@ -13,13 +13,11 @@ import {
 import {
 	sm4Key
 } from "../network/api.js";
-import {
-	SM4Util
-} from '../util/sm4.js'
+import s4 from '../util/sm4.js'
 import {
 	updateToken
 } from "@/utils/network/api";
-const s4 = new SM4Util()
+// const s4 = new SM4Util()
 
 /* 刷新token */
 function updateGetToken() {

utils/util/sm4.js

@@ -13,7 +13,8 @@
  * var sm4 = new SM4Util();
  sm4.encryptData_CBC('');
  */
-import * as base64js from '../node-model/base64-js'
+import * as base64js from 'base64-js'
+console.log('base64js：',base64js)
 
 /**
  * 国密SM4加密算法
@@ -315,7 +316,7 @@ function SM4() {
 }
 
 
-export function SM4Util() {
+function SM4Util() {
 	// 和后端key一致
 	// 当时用CBC模式的时候
 	this.iv = "ZkR_SiNoSOFT=568"
@@ -511,4 +512,6 @@ export function SM4Util() {
 		}
 		return unicodeStr
 	}
-}
+}
+
+export default SM4Util;