From 6a189829531106872319d1508d93a3e05573ce74 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 02 四月 2024 15:08:07 +0800
Subject: [PATCH] 样式修改
---
packagePersonal/pages/userSetting/index.wxss | 6 -
packageDomain/pages/teacherCertification/index.wxss | 2
packageDomain/pages/teacherCertification/index.wxml | 14 +-
pages/cart/index.js | 4 -
packageDomain/pages/sampleBookList/applicationForm/index.js | 18 +++-
packageDomain/pages/sampleBookList/index.js | 79 +++++++++++--------
packageDomain/pages/sampleBookList/applicationForm/index.wxss | 3
packageDomain/pages/teacherCertification/index.js | 46 ++++++++---
pages/personalCenter/index.js | 6
packagePersonal/pages/userSetting/index.js | 32 +++++--
packageDomain/pages/sampleBookList/applicationForm/index.wxml | 6
11 files changed, 129 insertions(+), 87 deletions(-)
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.js b/packageDomain/pages/sampleBookList/applicationForm/index.js
index 4865e4c..6b599f9 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.js
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.js
@@ -146,11 +146,17 @@
const {
phoneError
} = this.data;
- const isPhoneNumber = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(e.detail.value);
- if (phoneError === isPhoneNumber) {
+ if (e.detail.value) {
+ const isPhoneNumber = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(e.detail.value);
+ if (phoneError === isPhoneNumber) {
+ this.setData({
+ phoneError: !isPhoneNumber,
+ "contactInfo.phone": e.detail.value,
+ });
+ }
+ } else {
this.setData({
- phoneError: !isPhoneNumber,
- "contactInfo.phone": e.detail.value,
+ phoneError: false,
});
}
},
@@ -234,13 +240,13 @@
electronicBookList: [],
bookList: [],
})
- wx.setStorageSync("electronicBookList", []);
+ wx.removeStorageSync("electronicBookList")
} else {
that.setData({
paperBookList: [],
bookList: [],
})
- wx.setStorageSync("paperBookList", []);
+ wx.removeStorageSync("paperBookList")
}
wx.showModal({
title: '鎻愮ず锛�', //鎻愮ず鐨勬爣棰�
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.wxml b/packageDomain/pages/sampleBookList/applicationForm/index.wxml
index eea814a..35902ba 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.wxml
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.wxml
@@ -58,19 +58,19 @@
<view class="item">
<text class="label">濮撳悕锛�</text>
<view class="item-content">
- <t-input placeholder="璇疯緭鍏ョ湡瀹炲鍚�" borderless adjust-position="false" value="{{contactInfo.fullName}}" bindchange="onFullNameInput" />
+ <t-input placeholder="璇疯緭鍏ョ湡瀹炲鍚�" borderless value="{{contactInfo.fullName}}" bindchange="onFullNameInput" />
</view>
</view>
<view class="item">
<text class="label">鑱旂郴鐢佃瘽锛�</text>
<view class="item-content">
- <t-input placeholder="杈撳叆鑱旂郴鐢佃瘽" borderless adjust-position="false" value="{{contactInfo.phone}}" type="number" tips="{{phoneError ? '鎵嬫満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onPhoneInput" />
+ <t-input placeholder="杈撳叆鑱旂郴鐢佃瘽" borderless value="{{contactInfo.phone}}" type="number" tips="{{phoneError ? '鎵嬫満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onPhoneInput" />
</view>
</view>
<view class="item">
<text class="label">璇︾粏鍦板潃锛�</text>
<view class="item-content">
- <t-input placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" borderless adjust-position="false" value="{{contactInfo.detailedAddress}}" bindchange="onAddressInput" />
+ <t-input placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" borderless value="{{contactInfo.detailedAddress}}" bindchange="onAddressInput" />
</view>
</view>
</view>
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.wxss b/packageDomain/pages/sampleBookList/applicationForm/index.wxss
index 613a3ff..1627d37 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.wxss
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.wxss
@@ -199,8 +199,9 @@
}
.btn-area {
- margin: 40rpx 0;
+ margin: 40rpx;
padding: 0 40rpx;
+ padding-bottom: 60rpx;
}
.submit {
diff --git a/packageDomain/pages/sampleBookList/index.js b/packageDomain/pages/sampleBookList/index.js
index 9d63ba3..0858a02 100644
--- a/packageDomain/pages/sampleBookList/index.js
+++ b/packageDomain/pages/sampleBookList/index.js
@@ -145,11 +145,7 @@
this.setData({
userInfo: JSON.parse(wx.getStorageSync(app.config.userInfoKey))
})
- this.getAlreadyPBookList()
- this.getAlreadyEBookList()
- // 鑾峰彇鐢宠娆℃暟
- this.getSelectPaperBookCount()
- this.getSelectBookCount()
+
}
},
@@ -164,19 +160,32 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow() {
- if (wx.getStorageSync("paperBookList")) {
- this.setData({
- paperBookList: wx.getStorageSync("paperBookList"),
- })
- }
- if (wx.getStorageSync("electronicBookList")) {
- this.setData({
- electronicBookList: wx.getStorageSync("electronicBookList"),
- })
- }
this.setData({
- num: this.data.paperBookList.length + this.data.electronicBookList.length
+ page: 1,
+ paperBookList: [],
+ electronicBookList: []
})
+ this.getAlreadyPBookList()
+ this.getAlreadyEBookList()
+ // 鑾峰彇鐢宠娆℃暟
+ this.getSelectPaperBookCount()
+ this.getSelectBookCount()
+ console.log(this.data.electronicBookList.length, this.data.paperBookList.length, 1)
+ if (wx.getStorageSync("paperBookList") || wx.getStorageSync("electronicBookList")) {
+ if (wx.getStorageSync("paperBookList")) {
+ this.setData({
+ paperBookList: wx.getStorageSync("paperBookList"),
+ })
+ }
+ if (wx.getStorageSync("electronicBookList")) {
+ this.setData({
+ electronicBookList: wx.getStorageSync("electronicBookList"),
+ })
+ }
+ this.setData({
+ num: this.data.paperBookList.length + this.data.electronicBookList.length
+ })
+ }
this.getBookList(false);
},
goBack() {
@@ -184,7 +193,7 @@
},
// 鑾峰彇绾歌川涔﹀墿浣欐鏁�
- getSelectPaperBookCount(item) {
+ getSelectPaperBookCount() {
app.MG.app
.getTicketResult({
ticketRefCodeOrGuid: 'paperSampleBookapplyNum',
@@ -197,7 +206,7 @@
})
},
// 鑾峰彇鐢靛瓙涔﹀墿浣欐鏁�
- getSelectBookCount(item) {
+ getSelectBookCount() {
app.MG.app
.getTicketResult({
ticketRefCodeOrGuid: 'electronicSampleBookapplyNum',
@@ -430,26 +439,30 @@
}
if (that.data.alreadyPaperBookList.length > 0) {
that.data.alreadyPaperBookList.forEach((pBook) => {
- pBook.content.forEach((pBookItem) => {
- if (pBookItem.id === item.id && pBook.state == 'WaitAudit') {
- item.paperDisabled = true
- item.paperChecked = true
- }
- if (pBookItem.id === item.id && pBook.state == 'Normal') {
- item.paperDisabled = false
- }
- })
+ if (pBook.content.length > 0) {
+ pBook.content.forEach((pBookItem) => {
+ if (pBookItem.id === item.id && pBook.state == 'WaitAudit') {
+ item.paperDisabled = true
+ item.paperChecked = true
+ }
+ if (pBookItem.id === item.id && pBook.state == 'Normal') {
+ item.paperDisabled = false
+ }
+ })
+ }
})
}
if (that.data.alreadyElectronicBookList.length > 0) {
that.data.alreadyElectronicBookList.forEach((eBook) => {
- eBook.content.forEach((eBookItem) => {
- if (eBookItem.id === item.id && !eBook.isExpiry && eBook.state != 'Reject') {
- item.electronDisabled = true
- item.electronChecked = true
- }
- })
+ if (eBook.content.length > 0) {
+ eBook.content.forEach((eBookItem) => {
+ if (eBookItem.id === item.id && !eBook.isExpiry && eBook.state != 'Reject') {
+ item.electronDisabled = true
+ item.electronChecked = true
+ }
+ })
+ }
})
}
if (that.data.paperBookList.length > 0) {
diff --git a/packageDomain/pages/teacherCertification/index.js b/packageDomain/pages/teacherCertification/index.js
index afaf20a..28fa09f 100644
--- a/packageDomain/pages/teacherCertification/index.js
+++ b/packageDomain/pages/teacherCertification/index.js
@@ -112,7 +112,7 @@
defaultUser = {
...teacherInfos,
nickName: nickNameData && JSON.parse(nickNameData.data).nickName ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
- icon: nickNameData && JSON.parse(nickNameData.data).icon ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
+ icon: nickNameData && JSON.parse(nickNameData.data).icon != "" ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
userId: res.userId,
role: 'Teacher',
roleId: teacherRole.role.id,
@@ -122,7 +122,7 @@
defaultUser = {
...WeChatInfo,
nickName: nickNameData && JSON.parse(nickNameData.data).nickName ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
- icon: nickNameData && JSON.parse(nickNameData.data).icon ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
+ icon: nickNameData && JSON.parse(nickNameData.data).icon != "" ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
userId: res.userId,
}
}
@@ -326,11 +326,17 @@
const {
phoneError
} = this.data;
- const isPhoneNumber = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(e.detail.value);
- if (phoneError === isPhoneNumber) {
+ if (e.detail.value) {
+ const isPhoneNumber = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(e.detail.value);
+ if (phoneError === isPhoneNumber) {
+ this.setData({
+ phoneError: !isPhoneNumber,
+ "teacherInfo.phone": e.detail.value,
+ });
+ }
+ } else {
this.setData({
- phoneError: !isPhoneNumber,
- "teacherInfo.phone": e.detail.value,
+ phoneError: false,
});
}
},
@@ -339,11 +345,17 @@
const {
telphoneError
} = this.data;
- const isPhoneNumber = /^0\d{2}-\d{8}$|^0\d{3}-\d{7}$/.test(e.detail.value);
- if (telphoneError === isPhoneNumber) {
+ if (e.detail.value) {
+ const isPhoneNumber = /^0\d{2}-\d{8}$|^0\d{3}-\d{7}$/.test(e.detail.value);
+ if (telphoneError === isPhoneNumber) {
+ this.setData({
+ telphoneError: !isPhoneNumber,
+ "teacherInfo.telphone": e.detail.value,
+ });
+ }
+ } else {
this.setData({
- telphoneError: !isPhoneNumber,
- "teacherInfo.telphone": e.detail.value,
+ telphoneError: false,
});
}
},
@@ -351,11 +363,17 @@
const {
emailError
} = this.data;
- const isPhoneNumber = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/.test(e.detail.value);
- if (emailError === isPhoneNumber) {
+ if (e.detail.value) {
+ const isPhoneNumber = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/.test(e.detail.value);
+ if (emailError === isPhoneNumber) {
+ this.setData({
+ emailError: !isPhoneNumber,
+ "teacherInfo.email": e.detail.value,
+ });
+ }
+ } else {
this.setData({
- emailError: !isPhoneNumber,
- "teacherInfo.email": e.detail.value,
+ emailError: false,
});
}
},
diff --git a/packageDomain/pages/teacherCertification/index.wxml b/packageDomain/pages/teacherCertification/index.wxml
index eb95bd7..18eec56 100644
--- a/packageDomain/pages/teacherCertification/index.wxml
+++ b/packageDomain/pages/teacherCertification/index.wxml
@@ -19,13 +19,13 @@
<view class="from-item">
<view class="label"> 瀛︽牎锛� </view>
<view class="item-content">
- <t-input placeholder="璇疯緭鍏ュ鏍�" borderless adjust-position="false" value="{{teacherInfo.schoolName}}" disabled="{{!editState}}" bindchange="onSchoolNameInput" />
+ <t-input placeholder="璇疯緭鍏ュ鏍�" borderless value="{{teacherInfo.schoolName}}" disabled="{{!editState}}" bindchange="onSchoolNameInput" />
</view>
</view>
<view class="from-item">
<view class="label"> 鐪熷疄濮撳悕锛� </view>
<view class="item-content">
- <t-input placeholder="璇疯緭鍏ョ湡瀹炲鍚�" borderless adjust-position="false" value="{{teacherInfo.fullName}}" disabled="{{!editState}}" bindchange="onFullNameInput" />
+ <t-input placeholder="璇疯緭鍏ョ湡瀹炲鍚�" borderless value="{{teacherInfo.fullName}}" disabled="{{!editState}}" bindchange="onFullNameInput" />
</view>
</view>
<view class="from-item">
@@ -43,31 +43,31 @@
<view class="from-item">
<view class="label"> 浠绘暀璇剧▼锛� </view>
<view class="item-content">
- <t-input placeholder="璇疯緭鍏ヤ换鏁欒绋�" borderless adjust-position="false" value="{{teacherInfo.courseName}}" bindchange="onCourseNameInput" disabled="{{!editState}}" />
+ <t-input placeholder="璇疯緭鍏ヤ换鏁欒绋�" borderless value="{{teacherInfo.courseName}}" bindchange="onCourseNameInput" disabled="{{!editState}}" />
</view>
</view>
<view class="from-item">
<view class="label"> 鎵嬫満鍙凤細 </view>
<view class="item-content">
- <t-input placeholder="杈撳叆鎵嬫満鍙风爜" borderless adjust-position="false" value="{{teacherInfo.phone}}" type="number" tips="{{phoneError ? '鎵嬫満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onPhoneInput" disabled="{{!editState}}" />
+ <t-input placeholder="杈撳叆鎵嬫満鍙风爜" borderless value="{{teacherInfo.phone}}" type="number" tips="{{phoneError ? '鎵嬫満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onPhoneInput" disabled="{{!editState}}" />
</view>
</view>
<view class="from-item">
<view class="label"> 搴ф満锛� </view>
<view class="item-content">
- <t-input placeholder="杈撳叆搴ф満鍙�" borderless value="{{teacherInfo.telphone}}" adjust-position="false" tips="{{telphoneError ? '搴ф満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onTelphoneInput" disabled="{{!editState}}" />
+ <t-input placeholder="杈撳叆搴ф満鍙�" borderless value="{{teacherInfo.telphone}}" tips="{{telphoneError ? '搴ф満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onTelphoneInput" disabled="{{!editState}}" />
</view>
</view>
<view class="from-item">
<view class="label"> 閭锛� </view>
<view class="item-content">
- <t-input placeholder="杈撳叆閭" borderless adjust-position="false" value="{{teacherInfo.email}}" tips="{{emailError ? '閭杈撳叆涓嶆纭�' : ''}}" bindchange="onEmailInput" disabled="{{!editState}}" />
+ <t-input placeholder="杈撳叆閭" borderless value="{{teacherInfo.email}}" tips="{{emailError ? '閭杈撳叆涓嶆纭�' : ''}}" bindchange="onEmailInput" disabled="{{!editState}}" />
</view>
</view>
<view class="from-item">
<view class="label"> 璇︾粏鍦板潃锛� </view>
<view class="item-content">
- <t-input placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" borderless adjust-position="false" value="{{teacherInfo.detailedAddress}}" bindchange="onAddressInput" disabled="{{!editState}}" />
+ <t-input placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" borderless value="{{teacherInfo.detailedAddress}}" bindchange="onAddressInput" disabled="{{!editState}}" />
</view>
</view>
</view>
diff --git a/packageDomain/pages/teacherCertification/index.wxss b/packageDomain/pages/teacherCertification/index.wxss
index 80d5e0b..da744f1 100644
--- a/packageDomain/pages/teacherCertification/index.wxss
+++ b/packageDomain/pages/teacherCertification/index.wxss
@@ -173,7 +173,7 @@
.block {
position: relative;
width: 600rpx;
- height: 600rpx;
+ height: 820rpx;
padding: 20rpx 0;
background: #fff;
border-radius: 16rpx;
diff --git a/packagePersonal/pages/userSetting/index.js b/packagePersonal/pages/userSetting/index.js
index 1fcc0ea..fee72d8 100644
--- a/packagePersonal/pages/userSetting/index.js
+++ b/packagePersonal/pages/userSetting/index.js
@@ -64,8 +64,8 @@
if (teacherRole && teacherInfos) {
defaultUser = {
...teacherInfos,
- nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : teacherInfos.name,
- icon: nickNameData ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
+ nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : WeChatInfo ? WeChatInfo.name : '',
+ icon: nickNameData ? JSON.parse(nickNameData.data).icon : WeChatInfo ? WeChatInfo.icon : '',
userId: res.userId,
role: 'Teacher',
roleId: teacherRole.role.id,
@@ -207,11 +207,17 @@
const {
phoneError
} = this.data;
- const isPhoneNumber = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(e.detail.value);
- if (phoneError === isPhoneNumber) {
+ if (e.detail.value) {
+ const isPhoneNumber = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(e.detail.value);
+ if (phoneError === isPhoneNumber) {
+ this.setData({
+ phoneError: !isPhoneNumber,
+ "userInfoForm.phone": e.detail.value,
+ });
+ }
+ } else {
this.setData({
- phoneError: !isPhoneNumber,
- "userInfoForm.phone": e.detail.value,
+ phoneError: false,
});
}
},
@@ -220,11 +226,17 @@
const {
emailError
} = this.data;
- const isPhoneNumber = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/.test(e.detail.value);
- if (emailError === isPhoneNumber) {
+ if (e.detail.value) {
+ const isPhoneNumber = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/.test(e.detail.value);
+ if (emailError === isPhoneNumber) {
+ this.setData({
+ emailError: !isPhoneNumber,
+ "userInfoForm.email": e.detail.value,
+ });
+ }
+ } else {
this.setData({
- emailError: !isPhoneNumber,
- "userInfoForm.email": e.detail.value,
+ emailError: false,
});
}
},
diff --git a/packagePersonal/pages/userSetting/index.wxss b/packagePersonal/pages/userSetting/index.wxss
index 490dc08..5868c3f 100644
--- a/packagePersonal/pages/userSetting/index.wxss
+++ b/packagePersonal/pages/userSetting/index.wxss
@@ -71,14 +71,11 @@
}
.inputBox1 {
- height: 72rpx;
border: 2rpx solid #D9D9D9;
flex: 1;
}
-.inputBox1 .t-input {
- width: 380rpx !important;
-}
+
.block {
position: relative;
@@ -96,7 +93,6 @@
.block .body .inputBox {
width: 300rpx;
- height: 72rpx;
border: 2rpx solid #D9D9D9;
}
diff --git a/pages/cart/index.js b/pages/cart/index.js
index 672eecc..0682774 100644
--- a/pages/cart/index.js
+++ b/pages/cart/index.js
@@ -75,15 +75,12 @@
})
res.datas.forEach(item => {
- console.log(item, 'item456');
item.imgUrl = getPublicImage(item.productMonWithLinkDto.product.icon, '', '160');
-
// this.setData({
// type: item.saleMethod.type == 'createProductItemSaleMethod' ? 'item' : 'product'
// })
const type = item.saleMethod.type == 'createProductItemSaleMethod' ? 'item' : 'product';
item.type = type; // 灏唗ype璁剧疆涓篿tem瀵硅薄鐨勫睘鎬э紝鑰屼笉鏄娇鐢╯etData
-
// debugger
});
@@ -94,7 +91,6 @@
if (this.data.shoppingCartData.length === 0) {
- console.log(11111);
this.setData({
onDisabled: true
})
diff --git a/pages/personalCenter/index.js b/pages/personalCenter/index.js
index 9fa904c..8301703 100644
--- a/pages/personalCenter/index.js
+++ b/pages/personalCenter/index.js
@@ -199,8 +199,8 @@
if (teacherRole && teacherInfos) {
defaultUser = {
...teacherInfos,
- nickName: nickNameData && JSON.parse(nickNameData.data).nickName ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
- icon: nickNameData && JSON.parse(nickNameData.data).icon ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
+ nickName: nickNameData && JSON.parse(nickNameData.data).nickName ? JSON.parse(nickNameData.data).nickName : WeChatInfo ? WeChatInfo.name : '',
+ icon: nickNameData && JSON.parse(nickNameData.data).icon != "" ? JSON.parse(nickNameData.data).icon : WeChatInfo ? WeChatInfo.icon : '',
userId: res.userId,
role: 'Teacher',
roleId: teacherRole.role.id,
@@ -214,7 +214,7 @@
defaultUser = {
...WeChatInfo,
nickName: nickNameData && JSON.parse(nickNameData.data).nickName ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
- icon: nickNameData && JSON.parse(nickNameData.data).icon ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
+ icon: nickNameData && JSON.parse(nickNameData.data).icon != "" ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
userId: res.userId,
userType: type,
role: 'Student',
--
Gitblit v1.9.1