diff --git a/pages/additive/list/additive-list.wxml b/pages/additive/list/additive-list.wxml
index b635889..8921284 100644
--- a/pages/additive/list/additive-list.wxml
+++ b/pages/additive/list/additive-list.wxml
@@ -8,7 +8,11 @@
- {{item.name}}
+
+ {{item.name}}
+ cns: {{item.cns}}
+ ins: {{item.ins}}
+
{{item.enName}}
{{item.function}}
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index 67464a3..059b173 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -13,7 +13,9 @@
-
+
diff --git a/pages/home/home.wxss b/pages/home/home.wxss
index 7c8299d..0619562 100644
--- a/pages/home/home.wxss
+++ b/pages/home/home.wxss
@@ -51,6 +51,9 @@ page {
margin-right: 70px;
background-color: #ffcd38;
font-weight: 600;
+ display: flex;
+ justify-content: center;
+ align-items: center;
}
.home-page-container,
diff --git a/pages/home/session/session.js b/pages/home/session/session.js
index d91662c..11e8804 100644
--- a/pages/home/session/session.js
+++ b/pages/home/session/session.js
@@ -1,7 +1,8 @@
// pages/home/session/session.js
import {
sessionQuery,
- sessionAdditiveQuery
+ sessionAdditiveQuery,
+ sessionChangeStandard
} from '../../../services/api/session';
import {
sessionUpload
@@ -38,6 +39,10 @@ Page({
},
visibleImages: false,
additives: [],
+ inter: '',
+ standardPopupVisible: false,
+ standardDialogVisible: false,
+ changeStandard: ''
},
/**
@@ -49,6 +54,54 @@ Page({
this.init();
},
+ onChangeStandard() {
+ this.setData({
+ standardDialogVisible: true
+ })
+ },
+
+ onChangeStandardInput(e) {
+ this.setData({
+ changeStandard: e.detail.value
+ });
+ },
+
+ confirmStandardDialog() {
+ sessionChangeStandard({
+ id: this.sessionId,
+ standard: this.data.changeStandard
+ }).then(respose => {
+ if (respose.code == 10000) {
+ this.setData({
+ standardDialogVisible: false,
+ changeStandard: ''
+ });
+ this.init();
+ }
+ })
+ },
+
+ closeStandardDialog() {
+ this.setData({
+ standardDialogVisible: false
+ })
+ },
+
+ onOpenStandard() {
+ if (this.data.pageData.standardInfo.isFound != 1) {
+ return
+ }
+ this.setData({
+ standardPopupVisible: true
+ })
+ },
+
+ onVisibleChange(e) {
+ this.setData({
+ standardPopupVisible: e.detail.visible,
+ });
+ },
+
init() {
sessionQuery({
id: this.sessionId
@@ -59,13 +112,16 @@ Page({
pageData: respose.content
})
console.log(this.data.pageData);
+ if (respose.content.standardInfo.isFound == 2) {
+ this.startInter();
+ }
}
})
sessionAdditiveQuery({
id: this.sessionId
}).then(respose => {
this.setData({
- additives: respose.content.additives
+ additives: respose.content?.additives
})
})
},
@@ -91,11 +147,44 @@ Page({
},
+ /**
+ * 启动定时器
+ */
+ startInter: function () {
+ var that = this;
+ that.data.inter = setInterval(
+ function () {
+ // TODO 你需要无限循环执行的任务
+ console.log('setInterval 每过500毫秒执行一次任务')
+ sessionQuery({
+ id: that.sessionId
+ }).then(respose => {
+ if (respose.code == 10000) {
+ console.log(respose.content);
+ if (respose.content.standardInfo.isFound != 2) {
+ that.setData({
+ pageData: respose.content
+ })
+ console.log(this.data.pageData);
+ this.endInter();
+ }
+ }
+ })
+ }, 3000);
+ },
+ /**
+ * 结束定时器
+ */
+ endInter: function () {
+ var that = this;
+ clearInterval(that.data.inter);
+ },
+
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
-
+ this.endInter()
},
/**
@@ -120,7 +209,7 @@ Page({
},
onTabsClick(event) {
- console.log(`Click tab, tab-panel value is ${event.detail.value}.`);
+ // console.log(`Click tab, tab-panel value is ${event.detail.value}.`);
},
onShowImages() {
diff --git a/pages/home/session/session.json b/pages/home/session/session.json
index 7b5da53..6b751b3 100644
--- a/pages/home/session/session.json
+++ b/pages/home/session/session.json
@@ -14,6 +14,9 @@
"t-image-viewer": "tdesign-miniprogram/image-viewer/image-viewer",
"t-grid": "tdesign-miniprogram/grid/grid",
"t-grid-item": "tdesign-miniprogram/grid/grid-item",
- "t-rate": "tdesign-miniprogram/rate/rate"
+ "t-rate": "tdesign-miniprogram/rate/rate",
+ "t-popup": "tdesign-miniprogram/popup/popup",
+ "t-dialog": "tdesign-miniprogram/dialog/dialog",
+ "t-input": "tdesign-miniprogram/input/input"
}
}
\ No newline at end of file
diff --git a/pages/home/session/session.wxml b/pages/home/session/session.wxml
index 3fd7e12..c7cd01a 100644
--- a/pages/home/session/session.wxml
+++ b/pages/home/session/session.wxml
@@ -3,8 +3,7 @@