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

pages/index/index.vue

@@ -152,7 +152,8 @@
 						<image :src="fileURL + item.imgUrl" mode="aspectFill"></image>
 					</view>
 				</view>
-				<view class="more" @click="$util.navTo('/subpackage/orders/moreHighMsg/moreHighMsg',true)">查看更多</view>
+				<view v-if="state.highMsgData.length!=0" class="more"
+					@click="$util.navTo('/subpackage/orders/moreHighMsg/moreHighMsg',true)">查看更多</view>
 			</view>
 		</view>
 
@@ -553,6 +554,9 @@
 			state.highMsgData = stringToJson(res.bizContent).data
 			for (var i = 0; i < state.highMsgData.length; i++) {
 				state.highMsgData[i]["copywriting"] = getCodeName('COPYWRITING', state.highMsgData[i]["copywriting"])
+				if (state.highMsgData[i]["type"] == 3) {
+					state.highMsgData[i]["title"] = state.highMsgData[i]["hyperLink"]
+				}
 			}
 		})
 			.catch((err) => { console.log(err) });
@@ -567,8 +571,9 @@
 		} else if (item.type == 2) {
 			navTo(item.hyperLink)
 		} else if (item.type == 3) {
+			const param = encodeURIComponent(JSON.stringify(item))
 			uni.navigateTo({
-				url: `/subpackage/orders/moreHighMsg/textDetails`
+				url: `/subpackage/orders/moreHighMsg/textDetails?item=` + param
 			})
 		} else if (item.type == 4) {
 			uni.navigateToMiniProgram({

subpackage/orders/moreHighMsg/textDetails.vue

@@ -1,11 +1,66 @@
 <template>
-	<view>
-		文本详情
+
+	<view class="news-item" v-for="(item,index) in state.data" :key='index'>
+		<view class="left-text">
+			<view class="tit description">{{item.title}}</view>
+			<view class="span">{{item.copywriting}}</view>
+		</view>
+		<view class="image-box">
+			<image :src="fileURL + item.imgUrl"></image>
+		</view>
 	</view>
 </template>
 
-<script>
+<script setup lang="ts">
+	import { reactive } from "vue";
+	import { onLoad } from "@dcloudio/uni-app";
+	import { fileURL } from "@/datas/fileURL.js";
+	const state = reactive({
+		data: []
+	})
+	onLoad((option) => {
+		const params = JSON.parse(decodeURIComponent(option.item))
+		state.data.push(params)
+		console.log("params", params)
+	})
 </script>
-
 <style>
+	page {
+		background: #eef7f7;
+	}
+</style>
+<style lang="scss" scoped>
+	.news-item {
+		display: flex;
+		border: 1rpx solid #dcdcdc;
+		padding: 40rpx;
+		font-size: 30rpx;
+		box-sizing: border-box;
+		width: 90%;
+		margin: 30rpx auto;
+		background-color: white;
+	}
+
+	.image-box image {
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 10rpx;
+	}
+
+	.news-item .span {
+		font-size: 22rpx;
+		display: inline-block;
+		text-align: center;
+		background: #bae0f1;
+		border-radius: 6rpx;
+		color: #0a8f8a;
+		padding: 4rpx 8rpx;
+	}
+
+	.news-item .more {
+		font-size: 24rpx;
+		text-align: center;
+		color: #0a8f8a;
+		padding: 22rpx 0;
+	}
 </style>

utils/network/api.js

@@ -7,17 +7,17 @@ export const URL = "testmedusa.etcjz.cn";
 export const envs = {
 	//开发环境配置
 	development: {
-		// baseUrl: "https://qtzl.etcjz.cn",
-		baseUrl: "http://192.168.100.63:8087",
+		baseUrl: "https://qtzl.etcjz.cn",
+		// baseUrl: "http://192.168.100.63:8087",
 		// baseUrl: "https://testmedusa.etcjz.cn",
 		// baseUrl: "http://192.168.100.158:8085",
 	},
 	//生产环境配置
 	production: {
-		baseUrl: "http://192.168.100.63:8087",
+		// baseUrl: "http://192.168.100.63:8087",
 		// baseUrl: "http://222.85.144.89:19002",
 		// baseUrl: "http://192.168.100.158:8085/html/",
-		// baseUrl: "https://qtzl.etcjz.cn",
+		baseUrl: "https://qtzl.etcjz.cn",
 		// baseUrl: "https://testmedusa.etcjz.cn",
 	},
 }

utils/network/encryption.js

@@ -17,7 +17,8 @@ import {
 	SM4Util
 } from '../util/sm4.js'
 import {
-	getItem
+	getItem,
+	StorageKeys
 } from "@/utils/storage";
 const s4 = new SM4Util()
 
@@ -168,54 +169,54 @@ function textToBase64(text, key, iv) {
 	return base64;
 }
 
-//调用中台参数
-export function encryption(ifCode, subdata, type) {
-	var requestData = new Array();
-	requestData["ifCode"] = ifCode;
-	// requestData["appId"] = "52030131"; // || "admin001"
-	requestData["appId"] = "admin001"; // || "admin001"
-	requestData["signType"] = "MD5"; // || "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["sign"] = md5(
-		"bizContent=" + requestData["bizContent"] +
-		"&signType=" + requestData["signType"] +
-		"&encryptType=" + requestData["encryptType"] +
-		"&timestamp=" + requestData["timestamp"] +
-		"&ifCode=" + requestData["ifCode"]
-	);
-	let endData = arrayToJson(requestData);
-	return endData;
-}
 //调用中台参数
 // 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["signType"] = "MD5"; // || "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["accessToken"] = getItem(StorageKeys.Token)
-// 	requestData["sign"] = sm3(
-// 		"appId=" + requestData["appId"] +
-// 		"&bizContent=" + requestData["bizContent"] +
+// 	requestData["sign"] = md5(
+// 		"bizContent=" + requestData["bizContent"] +
 // 		"&signType=" + requestData["signType"] +
 // 		"&encryptType=" + requestData["encryptType"] +
 // 		"&timestamp=" + requestData["timestamp"] +
-// 		"&ifCode=" + requestData["ifCode"] +
-// 		"&reqId=" + requestData["reqId"] +
-// 		"&accessToken=" + requestData["accessToken"], key
+// 		"&ifCode=" + requestData["ifCode"]
 // 	);
 // 	let endData = arrayToJson(requestData);
 // 	return endData;
-// }
+// }
+//调用中台参数
+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["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["accessToken"] = getItem(StorageKeys.Token)
+	requestData["sign"] = sm3(
+		"appId=" + requestData["appId"] +
+		"&bizContent=" + requestData["bizContent"] +
+		"&signType=" + requestData["signType"] +
+		"&encryptType=" + requestData["encryptType"] +
+		"&timestamp=" + requestData["timestamp"] +
+		"&ifCode=" + requestData["ifCode"] +
+		"&reqId=" + requestData["reqId"] +
+		"&accessToken=" + requestData["accessToken"], key
+	);
+	let endData = arrayToJson(requestData);
+	return endData;
+}

utils/network/request.js

@@ -59,8 +59,7 @@ export function request(code, options = {}, start = false) {
 		rbacSource: 'MINI_PROGRAM',
 		accessToken: getItem(StorageKeys.Token)
 	}
-	// options.url = envs[process.env.NODE_ENV].baseUrl + '/api/interfaceMidGroundIn'
-	options.url = envs[process.env.NODE_ENV].baseUrl + '/ifzt/api/interfaceMidGroundIn'
+	options.url = envs[process.env.NODE_ENV].baseUrl + '/api/interfaceMidGroundIn'
 	// options.url = envs[process.env.NODE_ENV].baseUrl + '/ifzt/api/interfaceMidGroundIn'
 	//默认json数据格式提交`
 	let contentType = 'application/x-www-form-urlencoded'