Merge branch 'master' into 'main'

新增研究成果栏

See merge request lab-equipment-project/lab-equipment-mini-program!7

api/visitor.js

@@ -9,6 +9,18 @@ export function assetDetail(barCode) {
 	return request.get(`/visitor/asset/detail/${barCode}`)
 }
 
+export function studyList() {
+	return request.get('/visitor/study/list')
+}
+
+export function studyNew(number) {
+	return request.get(`/visitor/study/new?number=${number}`)
+}
+
+export function studyDetail(studyId) {
+	return request.get(`/visitor/study/detail/${noticeId}`)
+}
+
 export function getImage(src) {
 	if (!src) {
 		return;

pages/visitor/assetDetail/assetDetail.vue

@@ -8,21 +8,21 @@
 				<view class="name">{{assetInfo.name}}</view>
 				<scroll-view class="content" scroll-y="true">
 					<view class="introduce">
-						简介：<br/>{{assetInfo.introduce}}
+						简介：<br/><text selectable="true">{{assetInfo.introduce}}</text>
 					</view>
 				</scroll-view>
 				
 				<view class="name2">设备详情</view>
 				<scroll-view class="content1" scroll-y="true">
-					<view v-if="assetInfo.specificationsModel">规格：{{assetInfo.specificationsModel}}</view>
-					<view v-if="assetInfo.purpose">用途：{{assetInfo.purpose}}</view>
-					<view v-if="assetInfo.kind">种类：{{assetInfo.kind}}</view>
-					<view v-if="assetInfo.placeName">位置：{{assetInfo.placeName}}</view>
-					<view v-if="assetInfo.amount">原值：{{assetInfo.amount}}</view>
-					<view v-if="assetInfo.brand">品牌：{{assetInfo.brand}}</view>
-					<view v-if="assetInfo.manufacturer">厂商：{{assetInfo.manufacturer}}</view>
-					<view>编号：{{assetInfo.number}}</view>
-					<view>条形码：{{assetInfo.barCode}}</view>
+					<view v-if="assetInfo.specificationsModel">规格：<text selectable="true">{{assetInfo.specificationsModel}}</text></view>
+					<view v-if="assetInfo.purpose">用途：<text selectable="true">{{assetInfo.purpose}}</text></view>
+					<view v-if="assetInfo.kind">种类：<text selectable="true">{{assetInfo.kind}}</text></view>
+					<view v-if="assetInfo.placeName">位置：<text selectable="true">{{assetInfo.placeName}}</text></view>
+					<view v-if="assetInfo.amount">原值：<text selectable="true">{{assetInfo.amount}}</text></view>
+					<view v-if="assetInfo.brand">品牌：<text selectable="true">{{assetInfo.brand}}</text></view>
+					<view v-if="assetInfo.manufacturer">厂商：<text selectable="true">{{assetInfo.manufacturer}}</text></view>
+					<view>编号：<text selectable="true">{{assetInfo.number}}</text></view>
+					<view>条形码：<text selectable="true">{{assetInfo.barCode}}</text></view>
 				</scroll-view>
 			</view>
 		</view>
@@ -96,15 +96,15 @@ page{
 			}
 			.content{
 				height: 175rpx;
-				width: 100%;
-				overflow: auto;
+				// width: 100%;
+				// overflow: auto;
 				.introduce{
 					color: #696969;
 				}
 				
 				/* 设置滚动条样式 */
 				::-webkit-scrollbar {
-					width: 8px; /* 滚动条宽度 */
+					width: 80rpx; /* 滚动条宽度 */
 				}
 
 				/* 设置滚动条轨道背景颜色 */
@@ -115,7 +115,7 @@ page{
 				/* 设置滚动条滑块颜色 */
 				::-webkit-scrollbar-thumb {
 					background-color: #888;
-					border-radius: 4px; /* 可选，设置滑块的圆角 */
+					border-radius: 4rpx; /* 可选，设置滑块的圆角 */
 				}
 			}
 			.name2{

pages/visitor/index.vue

@@ -23,13 +23,21 @@
 				研究成果栏
 			</view>
 			<view class="list">
-				<view class="study" v-for="(n, index) in 2" :key="index">
-					一条研究成果&nbsp;一条研究成果&nbsp;一条研究成果&nbsp;一条研究成果&nbsp;一条研究成果&nbsp;一条研究成果&nbsp;一条研究成果&nbsp;
-					一条研究成果&nbsp;一条研究成果&nbsp;一条研究成果&nbsp;一条研究成果&nbsp;一条研究成果&nbsp;一条研究成果&nbsp;一条研究成果&nbsp;
+				<view class="study" v-for="study in studyList" :key="study.id">
+					<view class="title">
+						{{study.noticeTitle}}
+					</view>
+					<view class="content">
+						<rich-text :nodes="study.noticeContent" style="text-indent: 2em;"></rich-text>
+					</view>
+				</view>
+				<view class="study" v-if="!studyList.length">
+					<view class="title" style="text-align: center;">
+						暂无数据
+					</view>
 				</view>
 			</view>
 		</view>
-		
 		<view class="asset-box">
 			<view class="title">
 				公开设备
@@ -38,7 +46,7 @@
 			<view class="list">
 				<view class="asset" v-for="asset in assetList" @click="toDetail(asset)">
 					<view class="left">
-						<image class="image" :src="imgSrc(asset.img)" mode="aspectFit"></image>
+						<image class="image" :src="imgSrc(asset.img)" mode="aspectFit" @error="imgError"></image>
 					</view>
 					
 					<view class="right">
@@ -46,7 +54,7 @@
 							{{asset.name}}
 						</view>
 						<view class="introduce">
-							{{asset.introduce}}
+							<text>{{asset.introduce}}</text>
 						</view>
 					</view>
 				</view>
@@ -56,12 +64,13 @@
 </template>
 
 <script>
-	import { assetList, getImage } from '@/api/visitor.js'
+	import { assetList, studyNew, getImage } from '@/api/visitor.js'
 	export default {
 		name: 'Visitor-Index',
 		data() {
 			return {
-				assetList: []
+				assetList: [],
+				studyList: []
 			}
 		},
 		methods: {
@@ -70,9 +79,18 @@
 					this.assetList = res
 				})
 			},
+			getNewStudy() {
+				studyNew(5).then(res => {
+					this.studyList = res
+					console.log('研究成果数据', res);
+				})
+			},
 			imgSrc(src) {
 				return getImage(src)
 			},
+			imgError(err) {
+				console.log('图片异常', err.detail.errMsg);
+			},
 			/** 搜索框 */
 			search() {},
 			toDetail(asset) {
@@ -83,6 +101,7 @@
 			}
 		},
 		onLoad() {
+			this.getNewStudy()
 			this.getAssetList()
 		}
 	}
@@ -113,6 +132,28 @@
 			
 			.study {
 				line-height: 50rpx;
+				margin-bottom: 10rpx;
+				padding-bottom: 20rpx;
+				border-bottom: 1rpx solid #dddddd;
+				
+				.title {
+					font-size: 36rpx;
+					width: 100%;
+					text-align: left;
+					font-weight: 500;
+					margin-bottom: 5rpx;
+					overflow: hidden;  /*超出部分隐藏*/
+					white-space: nowrap;  /*禁止换行*/
+					text-overflow: ellipsis; /*省略号*/
+				}
+				.content {
+					font-size: 24rpx;
+					line-height: 40rpx;
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 3;
+					overflow: hidden;
+				}
 			}
 		}
 		

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -780,8 +780,8 @@ function populateParameters(result) {
     appVersion: "1.0.0",
     appVersionCode: "100",
     appLanguage: getAppLanguage(hostLanguage),
-    uniCompileVersion: "3.8.3",
-    uniRuntimeVersion: "3.8.3",
+    uniCompileVersion: "3.8.4",
+    uniRuntimeVersion: "3.8.4",
     uniPlatform: undefined || "mp-weixin",
     deviceBrand: deviceBrand,
     deviceModel: model,
@@ -1557,7 +1557,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"lab-equipment-mini-program","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"lab-equipment-mini-program","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8938,7 +8938,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"lab-equipment-mini-program","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"lab-equipment-mini-program","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8959,14 +8959,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"lab-equipment-mini-program","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"lab-equipment-mini-program","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"lab-equipment-mini-program","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"lab-equipment-mini-program","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -9062,7 +9062,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"lab-equipment-mini-program","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"lab-equipment-mini-program","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -19331,6 +19331,9 @@ exports.assetDetail = assetDetail;
 exports.assetList = assetList;
 exports.getImage = getImage;
 exports.playerVideo = playerVideo;
+exports.studyDetail = studyDetail;
+exports.studyList = studyList;
+exports.studyNew = studyNew;
 var _request = _interopRequireDefault(__webpack_require__(/*! @/utils/request */ 175));
 var _baseurl = _interopRequireDefault(__webpack_require__(/*! @/utils/baseurl.js */ 176));
 function assetList() {
@@ -19339,6 +19342,15 @@ function assetList() {
 function assetDetail(barCode) {
   return _request.default.get("/visitor/asset/detail/".concat(barCode));
 }
+function studyList() {
+  return _request.default.get('/visitor/study/list');
+}
+function studyNew(number) {
+  return _request.default.get("/visitor/study/new?number=".concat(number));
+}
+function studyDetail(studyId) {
+  return _request.default.get("/visitor/study/detail/".concat(noticeId));
+}
 function getImage(src) {
   if (!src) {
     return;
@@ -24014,7 +24026,7 @@ function _extends() {
 var formatRegExp = /%[sdj%]/g;
 var warning = function warning() {}; // don't print warning message when in production env or node runtime
 
-if (typeof process !== 'undefined' && Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"lab-equipment-mini-program","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
+if (typeof process !== 'undefined' && Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"lab-equipment-mini-program","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
   warning = function warning(type, errors) {
     if (typeof console !== 'undefined' && console.warn) {
       if (errors.every(function (e) {

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -2,7 +2,6 @@
     "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
     "projectname": "lab-equipment-mini-program",
     "setting": {
-        "compileHotReLoad": true,
-        "bigPackageSizeSupport": true
+        "compileHotReLoad": true
     }
 }