diff --git a/assets/itemImg/Audi-RS7.png b/assets/itemImg/Audi-RS7.png
new file mode 100644
index 0000000..a2dc714
Binary files /dev/null and b/assets/itemImg/Audi-RS7.png differ
diff --git a/pages2/appointment/appointment.ttml b/pages2/appointment/appointment.ttml
index 22ab3d1..5221bf2 100644
--- a/pages2/appointment/appointment.ttml
+++ b/pages2/appointment/appointment.ttml
@@ -45,34 +45,34 @@
请选择
-
-
-
- 选择可用商户:{{
- mallList[currentIndex].merchantName }}
- 选择可用商户:{{ reservationMerchantName
- }}
-
-
+
+
+ 选择可用商户:{{
+ mallList[currentIndex].merchantName }}
+ 选择可用商户:{{ reservationMerchantName
+ }}
+
+
-
- 选择可用商户(BETA):
+
+ 选择可用商户(BETA):
-
- 请选择
-
+
+ 请选择
+
-
+
-
-
-
+
+
+
-
-
-
-
\ No newline at end of file
+
+
+
+
+
\ No newline at end of file
diff --git a/pages2/shopSelect/shopSelect.js b/pages2/shopSelect/shopSelect.js
index 68e9f4b..a0a20a1 100644
--- a/pages2/shopSelect/shopSelect.js
+++ b/pages2/shopSelect/shopSelect.js
@@ -1,9 +1,49 @@
// c:\Users\56817\Desktop\Working Space\3,TikTok-MiniPro\ttc\pages2\shopSelect\shopSelect.js
Page({
data: {
-
+ isShop: true,
+ position: 0,
+ tagArr: [],
+ currentTag: ""
},
onLoad: function (options) {
+ const tagArr = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']
+ this.setData({
+ tagArr
+ })
+ },
+
+ selectCity() {
+ this.setData({
+ isShop: false
+ })
+ },
+
+ selectShop() {
+ this.setData({
+ isShop: true
+ })
+ },
- }
+ indexBarMove(e) {
+
+ },
+
+ tagBind(e) {
+ const that = this
+ tt.hideToast({
+ success: (res) => {
+ const id = e.target.id
+ that.setData({
+ currentTag: id
+ })
+ tt.showToast({
+ title: id,
+ icon: "none",
+ duration: 1000
+ });
+ },
+ });
+
+ },
})
\ No newline at end of file
diff --git a/pages2/shopSelect/shopSelect.less b/pages2/shopSelect/shopSelect.less
new file mode 100644
index 0000000..2ec1d47
--- /dev/null
+++ b/pages2/shopSelect/shopSelect.less
@@ -0,0 +1,110 @@
+/* c:\Users\56817\Desktop\Working Space\3,TikTok-MiniPro\ttc\pages2\shopSelect\shopSelect.ttss */
+page {
+ font-size: 30rpx;
+ box-sizing: border-box !important;
+ background-color: #fff;
+
+ .continer {
+ width: 95%;
+ height: 100%;
+ margin: auto;
+ padding: 30rpx 0;
+
+ .selectShop {
+ .nav {
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 20rpx;
+ padding: 0 20rpx;
+
+ .item {
+ color: #ffffff;
+ padding: 8rpx 15rpx;
+ background-image: linear-gradient(to top, #48c6ef 0%, #6f86d6 100%);
+ border-radius: 15rpx;
+ }
+ }
+
+ .shopList {
+ width: 100%;
+ background-color: #ffffff;
+ border-radius: 10rpx;
+ padding: 20rpx 0;
+ margin: auto;
+
+ .item {
+ display: flex;
+ justify-content: space-between;
+ width: 95%;
+ margin: auto;
+ color: #ffffff;
+ margin-bottom: 30rpx;
+ padding: 20rpx 25rpx;
+ box-sizing: border-box !important;
+ background-image: linear-gradient(to top, #48c6ef 0%, #6f86d6 100%);
+ border-radius: 12rpx;
+
+ .img {
+ width: 30%;
+ height: 170rpx;
+ }
+
+ .infoBox {
+ display: flex;
+ justify-content: space-between;
+ flex-direction: column;
+ width: 65%;
+ margin-left: 20rpx;
+ padding: 8rpx 0;
+
+ .infoItem {
+ width: 100%;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+ }
+ }
+ }
+ }
+
+ .selectCity {
+ .nav {
+ margin-bottom: 20rpx;
+ padding: 0 20rpx;
+
+ .item {
+ width: 10%;
+ color: #ffffff;
+ text-align: center;
+ padding: 8rpx 15rpx;
+ background-image: linear-gradient(to top, #48c6ef 0%, #6f86d6 100%);
+ border-radius: 15rpx;
+ }
+ }
+ }
+
+ .indexBar {
+ position: fixed;
+ top: 10%;
+ right: 3%;
+ font-size: 25rpx;
+ text-align: center;
+ background-color: #00000075;
+ padding-top: 20rpx;
+ padding-bottom: 10rpx;
+ border-radius: 30rpx;
+
+ .indexBarItem {
+ width: 50rpx;
+ color: #ffffff;
+ margin-bottom: 10rpx;
+ transition: all 0.3s;
+
+ &.active {
+ color: #f92672;
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/pages2/shopSelect/shopSelect.ttml b/pages2/shopSelect/shopSelect.ttml
index 3448a34..6508779 100644
--- a/pages2/shopSelect/shopSelect.ttml
+++ b/pages2/shopSelect/shopSelect.ttml
@@ -1,2 +1,30 @@
-c:\Users\56817\Desktop\Working Space\3,TikTok-MiniPro\ttc\pages2\shopSelect\shopSelect.ttml
\ No newline at end of file
+
+
+
+ 当前城市:武汉
+ 切换城市
+
+
+
+
+
+ 家帮汇沧州店
+ 地址:湖北省汉川市仙女山街道办事处仙女大道100号1栋城北建筑公司1单元501室
+ 距您0.2km
+
+
+
+
+
+
+
+ 返回
+
+
+
+ {{
+ item }}
+
+
\ No newline at end of file
diff --git a/pages2/shopSelect/shopSelect.ttss b/pages2/shopSelect/shopSelect.ttss
index e7f0f4b..9455883 100644
--- a/pages2/shopSelect/shopSelect.ttss
+++ b/pages2/shopSelect/shopSelect.ttss
@@ -1 +1,93 @@
-/* c:\Users\56817\Desktop\Working Space\3,TikTok-MiniPro\ttc\pages2\shopSelect\shopSelect.ttss */
\ No newline at end of file
+/* c:\Users\56817\Desktop\Working Space\3,TikTok-MiniPro\ttc\pages2\shopSelect\shopSelect.ttss */
+page {
+ font-size: 30rpx;
+ box-sizing: border-box !important;
+ background-color: #fff;
+}
+page .continer {
+ width: 95%;
+ height: 100%;
+ margin: auto;
+ padding: 30rpx 0;
+}
+page .continer .selectShop .nav {
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 20rpx;
+ padding: 0 20rpx;
+}
+page .continer .selectShop .nav .item {
+ color: #ffffff;
+ padding: 8rpx 15rpx;
+ background-image: linear-gradient(to top, #48c6ef 0%, #6f86d6 100%);
+ border-radius: 15rpx;
+}
+page .continer .selectShop .shopList {
+ width: 100%;
+ background-color: #ffffff;
+ border-radius: 10rpx;
+ padding: 20rpx 0;
+ margin: auto;
+}
+page .continer .selectShop .shopList .item {
+ display: flex;
+ justify-content: space-between;
+ width: 95%;
+ margin: auto;
+ color: #ffffff;
+ margin-bottom: 30rpx;
+ padding: 20rpx 25rpx;
+ box-sizing: border-box !important;
+ background-image: linear-gradient(to top, #48c6ef 0%, #6f86d6 100%);
+ border-radius: 12rpx;
+}
+page .continer .selectShop .shopList .item .img {
+ width: 30%;
+ height: 170rpx;
+}
+page .continer .selectShop .shopList .item .infoBox {
+ display: flex;
+ justify-content: space-between;
+ flex-direction: column;
+ width: 65%;
+ margin-left: 20rpx;
+ padding: 8rpx 0;
+}
+page .continer .selectShop .shopList .item .infoBox .infoItem {
+ width: 100%;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+page .continer .selectCity .nav {
+ margin-bottom: 20rpx;
+ padding: 0 20rpx;
+}
+page .continer .selectCity .nav .item {
+ width: 10%;
+ color: #ffffff;
+ text-align: center;
+ padding: 8rpx 15rpx;
+ background-image: linear-gradient(to top, #48c6ef 0%, #6f86d6 100%);
+ border-radius: 15rpx;
+}
+page .continer .indexBar {
+ position: fixed;
+ top: 10%;
+ right: 3%;
+ font-size: 25rpx;
+ text-align: center;
+ background-color: #00000075;
+ padding-top: 20rpx;
+ padding-bottom: 10rpx;
+ border-radius: 30rpx;
+}
+page .continer .indexBar .indexBarItem {
+ width: 50rpx;
+ color: #ffffff;
+ margin-bottom: 10rpx;
+ transition: all 0.3s;
+}
+page .continer .indexBar .indexBarItem.active {
+ color: #f92672;
+}
diff --git a/project.private.config.json b/project.private.config.json
index 67e3e01..cb8636f 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -1,7 +1,7 @@
{
"condition": {
"miniprogram": {
- "current": -1,
+ "current": 1688192851587,
"list": [
{
"id": 1678508631604,
@@ -58,7 +58,7 @@
"location": "audit"
},
{
- "id": 1688143362650,
+ "id": 1688192851587,
"name": "pages2/shopSelect/shopSelect",
"pathName": "pages2/shopSelect/shopSelect",
"query": "",