diff --git a/assets/itemImg/place.png b/assets/itemImg/place.png
new file mode 100644
index 0000000..9479a71
Binary files /dev/null and b/assets/itemImg/place.png differ
diff --git a/config/config.js b/config/config.js
index c0c5c24..5aeb8ed 100644
--- a/config/config.js
+++ b/config/config.js
@@ -78,7 +78,10 @@ var config = {
* 获取券适用门店List
*/
couponMerchant: "/wxCoupon/couponMerchant",
-
+ /**
+ * 获取适用门店所在的城市list
+ */
+ couponMerchantCity: "/wxCoupon/couponMerchantCity",
/**
* 获取券详情
*/
diff --git a/index/user.ttml b/index/user.ttml
index 2946f67..570055b 100644
--- a/index/user.ttml
+++ b/index/user.ttml
@@ -82,8 +82,10 @@
服务资质
-
+ Version 2.8.3
+
+
\ No newline at end of file
diff --git a/index/user.ttss b/index/user.ttss
index df80720..42840ab 100644
--- a/index/user.ttss
+++ b/index/user.ttss
@@ -1,5 +1,5 @@
/* d:\fumaolianke\ttFmC\tt富茂C\pages\user\user.ttss */
-.BoxBg{
+.BoxBg {
/* background-image: url("https://formall.oss-accelerate.aliyuncs.com/douyin_ifomall/imgData/userBg.png"); */
/* background-size: 100% auto; */
/* background-repeat: no-repeat; */
@@ -9,7 +9,8 @@
background-color: #e6e6e6;
overflow: hidden;
}
-.bgImgTop{
+
+.bgImgTop {
width: 100%;
height: 380rpx;
transform: rotate(16deg);
@@ -18,32 +19,38 @@
left: 0;
z-index: 1;
}
-.userBg{
+
+.userBg {
width: 100%;
height: 200rpx;
/* background:linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%); */
position: relative;
}
-.userBg1{
+
+.userBg1 {
width: 100%;
height: 200rpx;
/* background-image: url("/assets/imgData/userBg.png"); */
position: relative;
z-index: 1000;
}
+
button::after {
border: none;
- }
+}
+
button {
background-color: transparent;
padding-left: 0;
padding-right: 0;
- line-height:inherit;
+ line-height: inherit;
}
+
button {
- border-radius:0;
+ border-radius: 0;
}
-.userLogo{
+
+.userLogo {
position: absolute;
top: 40rpx;
left: 80rpx;
@@ -53,24 +60,29 @@ button {
border-radius: 50%;
border: 2rpx solid #A2B9BE;
}
-.userLogo open-data{
+
+.userLogo open-data {
display: block;
width: 100%;
height: 100%;
}
-.userLogo img{
+
+.userLogo img {
border-radius: 50% !important;
}
-.open{
+
+.open {
width: 100% !important;
- height:100% !important;
+ height: 100% !important;
border-radius: 50% !important;
overflow: hidden;
}
-.open img{
+
+.open img {
border-radius: 50% !important;
}
-.userData{
+
+.userData {
position: absolute;
top: 40rpx;
left: 180rpx;
@@ -79,23 +91,24 @@ button {
/* color: #ffffff; */
}
-.noInfo{
+.noInfo {
width: 220rpx;
margin-left: 20rpx;
font-size: 32rpx;
text-overflow: -o-ellipsis-lastline;
- overflow:hidden;
- text-overflow:ellipsis;
- display:-webkit-box;
- -webkit-box-orient:vertical;
- -webkit-line-clamp:1;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 1;
color: #02201c;
font-family: "PingFangSC-Medium";
font-size: 36rpx;
font-weight: 400;
text-transform: uppercase;
}
-.info{
+
+.info {
border: 1rpx #ffffff solid;
border-radius: 50rpx;
padding: 0 10rpx;
@@ -104,7 +117,8 @@ button {
text-align: center;
/* width: 130rpx; */
}
-.infoX{
+
+.infoX {
/* border: 1rpx #ffffff solid; */
border-radius: 50rpx;
padding: 0 10rpx;
@@ -117,19 +131,22 @@ button {
text-transform: uppercase;
/* text-align: center; */
}
-.userName{
+
+.userName {
position: absolute;
top: 60rpx;
left: 180rpx;
font-size: 26rpx;
color: #ffffff;
}
-.tempBpx{
+
+.tempBpx {
position: relative;
width: 680rpx;
height: 160rpx;
}
-.functionBox{
+
+.functionBox {
position: absolute;
width: 680rpx;
height: 160rpx;
@@ -139,30 +156,35 @@ button {
/* background-color: #ffffff; */
border-radius: 10rpx;
display: flex;
- justify-content:space-around;
+ justify-content: space-around;
/* overflow: hidden; */
z-index: 100;
}
-.itemBox{
- width:30% ;
+
+.itemBox {
+ width: 30%;
/* text-align: center; */
}
-.itemLogoBox{
+
+.itemLogoBox {
width: 60rpx;
height: 60rpx;
/* background-color: #cacaca; */
margin: 20rpx auto 0 auto;
}
-.itemLogo{
+
+.itemLogo {
width: 100%;
height: 100%;
}
-.itemNAme{
+
+.itemNAme {
text-align: center;
font-size: 26rpx;
margin-top: 10rpx;
}
-.moreBox{
+
+.moreBox {
width: 680rpx;
margin: 20rpx auto 0 auto;
background-color: #ffffff;
@@ -172,26 +194,31 @@ button {
position: absolute;
z-index: 1000;
}
-.fuwu{
+
+.fuwu {
/* font-size: 28rpx; */
- margin: 20rpx 0 20rpx 40rpx ;
+ margin: 20rpx 0 20rpx 40rpx;
color: #5d3a19;
font-family: "PingFangSC-Medium";
font-size: 32rpx;
font-weight: 400;
}
-.fuwuItemBox{
+
+.fuwuItemBox {
/* display: flex; */
overflow: hidden;
}
-.f{
+
+.f {
float: left;
}
-.r{
+
+.r {
float: right;
}
-.fuwuItem{
+
+.fuwuItem {
/* width: 25%; */
/* background-color: aquamarine; */
border-bottom: 1rpx #f6f6f6 solid;
@@ -201,14 +228,23 @@ button {
margin: 0 auto;
}
-.fuwuLogoBox{
+
+.fuwuLogoBox {
width: 50rpx;
height: 50rpx;
/* background-color: #fb3e5c; */
}
-.fuwuName{
+
+.fuwuName {
text-align: center;
font-size: 24rpx;
margin-top: 10rpx;
margin-left: 10rpx;
+}
+
+.version {
+ position: absolute;
+ bottom: 0;
+ right: 5%;
+ color: #ffffffb9;
}
\ No newline at end of file
diff --git a/pages/coupon/confirmation/confirmation.js b/pages/coupon/confirmation/confirmation.js
index 4b89768..fb541ac 100644
--- a/pages/coupon/confirmation/confirmation.js
+++ b/pages/coupon/confirmation/confirmation.js
@@ -182,6 +182,7 @@ Page({
mallLocationArr.forEach((item, index) => {
const distanceData = that.getDistances(latitudeNow, longitudeNow, item.latitude, item.longitude)
tempArr[index].distance_str = distanceData.distance_str
+ tempArr[index].distance_str = distanceData.distance_str
tempArr[index].distanceName = tempArr[index].merchantName + ' ' + distanceData.distance_str
tempArr[index].distance = distanceData.distance
bloobArr.push(tempArr[index])
@@ -207,7 +208,19 @@ Page({
},
complete: finish => {
-
+ let isSuccess = 0
+ const mallList = that.data.mallList
+ mallList.forEach(item => {
+ if (item.distance_str) {
+ isSuccess = 1
+ }
+ })
+ if (!isSuccess) {
+ tt.showToast({
+ title: '定位失败!',
+ icon: "fail"
+ });
+ }
}
})
},
@@ -639,7 +652,7 @@ Page({
*/
orderFunc(discount) {
if (this.data.showbutton) return;
- if (!this.data.merchantId) {
+ if (!this.data.merchantId && this.data.data.type == 69) {
tt.showToast({
title: '请选择可用商户!',
icon: 'fail'
diff --git a/pages/coupon/confirmation/confirmation.ttml b/pages/coupon/confirmation/confirmation.ttml
index 316f27b..c4c2b23 100644
--- a/pages/coupon/confirmation/confirmation.ttml
+++ b/pages/coupon/confirmation/confirmation.ttml
@@ -38,7 +38,8 @@
选择可用商户:
+ range-key="{{mallList[0].distanceName ? 'distanceName' : 'merchantName'}}" disabled="{{false}}"
+ bindchange="setMerchant">
请选择
@@ -46,10 +47,12 @@
-
+
选择可用商户:{{
- mallList[currentIndex].merchantName }}
diff --git a/pages2/appointment/appointment.js b/pages2/appointment/appointment.js
index 6ac3e5d..62198c8 100644
--- a/pages2/appointment/appointment.js
+++ b/pages2/appointment/appointment.js
@@ -26,7 +26,8 @@ Page({
status: "",
isShowBtns: false,
latitude: "",
- longitude: ""
+ longitude: "",
+ shopItem: null
},
onLoad(options) {
console.log(options, 'options')
@@ -76,7 +77,7 @@ Page({
endTime: options.endTime || '',
})
- this.getCouponMerchant(options.orderId)
+ // this.getCouponMerchant()
if (this.data.id) {
this.getDetail(this.data.id)
@@ -87,6 +88,19 @@ Page({
}
},
+ goSelectShop() {
+ const data = this.data
+ const id = data.id
+ const orderId = data.orderId
+ const merOrderId = data.merOrderId
+ const startTime = data.startTime
+ const endTime = data.endTime
+
+ tt.navigateTo({
+ url: `/pages2/shopSelect/shopSelect?id=${id}&orderId=${orderId}&merOrderId=${merOrderId}&startTime=${startTime}&endTime=${endTime}`,
+ });
+ },
+
setMerchant(e) {
console.log(e.detail.value, 'e');
const index = e.detail.value
@@ -160,7 +174,19 @@ Page({
},
complete: finish => {
-
+ let isSuccess = 0
+ const mallList = that.data.mallList
+ mallList.forEach(item => {
+ if (item.distance_str) {
+ isSuccess = 1
+ }
+ })
+ if (!isSuccess) {
+ tt.showToast({
+ title: '定位失败!',
+ icon: "fail"
+ });
+ }
}
})
},
@@ -211,12 +237,6 @@ Page({
})
},
- goSelectShop() {
- tt.navigateTo({
- url: `/pages2/shopSelect/shopSelect`
- });
- },
-
chooseAddress() {
if (!this.data.isShowBtns) return
let that = this;
@@ -505,6 +525,16 @@ Page({
},
onShow() {
-
+ const shopItem = app.globalData.shopItem
+ if (shopItem) {
+ console.log('Yes!!!');
+ this.setData({
+ shopItem,
+ merchantId: shopItem.id,
+ reservationMerchantName: ""
+ })
+ console.log(this.data.shopItem, 'shopItem');
+ app.globalData.shopItem = null
+ }
}
})
\ No newline at end of file
diff --git a/pages2/appointment/appointment.ttml b/pages2/appointment/appointment.ttml
index 5221bf2..0d2c0e8 100644
--- a/pages2/appointment/appointment.ttml
+++ b/pages2/appointment/appointment.ttml
@@ -37,33 +37,44 @@
-
+
-
- 选择可用商户(BETA):
+
+ 选择可用商户(Beta):
请选择
+
+
+
+ 选择可用商户(Beta):{{ reservationMerchantName
+ }}
+ 选择可用商户:{{
+ shopItem.merchantName }}
diff --git a/pages2/shopSelect/shopSelect.js b/pages2/shopSelect/shopSelect.js
index a0a20a1..128826c 100644
--- a/pages2/shopSelect/shopSelect.js
+++ b/pages2/shopSelect/shopSelect.js
@@ -1,16 +1,270 @@
// c:\Users\56817\Desktop\Working Space\3,TikTok-MiniPro\ttc\pages2\shopSelect\shopSelect.js
+let config = require("../../config/config.js");
+let util = require("../../utils/util");
+let Http = require("../../utils/HttpBasics");
+let app = getApp();
+const imgurl = require("../../utils/imgurl");
+
Page({
data: {
isShop: true,
position: 0,
tagArr: [],
- currentTag: ""
+ mallList: [],
+ currentTag: "",
+ currentCity: "",
+ id: "",
+ orderId: "",
+ merOrderId: "",
+ startTime: "",
+ endTime: "",
+ latitude: "",
+ longitude: "",
+ toView: "A"
},
onLoad: function (options) {
+ tt.showLoading({
+ title: '加载中...',
+ })
+ console.log(options, 'options')
+
+ const mallTenantId = tt.getStorageSync('mallTenantId');
+ if (mallTenantId) {
+ this.setData({
+ mallTenantId
+ })
+ }
+
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
})
+
+ this.setData({
+ id: options.id || '',
+ orderId: options.orderId || '',
+ merOrderId: options.merOrderId || '',
+ startTime: options.startTime || '',
+ endTime: options.endTime || '',
+ })
+
+ this.getLocation()
+
+ },
+
+
+ getCouponChannelId(flag) {
+ const that = this
+ Http.get({
+ url: config.api.orderDetail,
+ data: {
+ orderId: that.data.merOrderId,
+ mallTenantId: that.data.mallTenantId || ''
+ }
+ }).then(res => {
+ const couponChannelId = res.data.orders[0].couponChannelId
+ that.getCouponMerchant(couponChannelId, flag)
+ that.getCityList(couponChannelId)
+ }).catch(err => {
+
+ })
+ },
+
+ //获取适用门店
+ getCouponMerchant(couponChannelId, flag) {
+ const that = this
+ Http.get({
+ url: config.api.couponMerchant,
+ data: {
+ couponChannelId,
+ city: that.data.currentCity,
+ mallTenantId: that.data.mallTenantId || ''
+ }
+ }).then(res => {
+ const keys = Object.keys(res.data)
+ if (keys.length > 0) {
+ const mallList = []
+ let i = 0
+ keys.forEach(item => {
+ const arr = item.split('|')
+ const obj = {
+ tenantId: arr[0],
+ mallName: arr[1],
+ merchantVoList: res.data[item],
+ expand: false
+ }
+ if (i == 0) {
+ obj.expand = true
+ }
+ mallList.push(obj)
+ i++
+ })
+ that.setData({
+ mallList: mallList[0].merchantVoList
+ })
+ console.log(that.data.mallList, 'mallList');
+
+ } else {
+ that.setData({
+ mallList: []
+ })
+ console.log(that.data.mallList, 'mallList');
+ }
+ if (flag) {
+ that.dealMallList()
+ }
+ tt.hideLoading();
+ })
+ },
+
+ // 获取适用门店所在的城市list
+ getCityList(couponChannelId) {
+ Http.get({
+ url: config.api.couponMerchantCity,
+ data: {
+ couponChannelId
+ }
+ }).then(res => {
+ console.log(res, 'res');
+ }).catch(err => {
+ console.log(err, 'err');
+ })
+ },
+
+ /**
+ * 获得经纬度
+ */
+ getLocation() {
+ console.log('getLocation');
+ const that = this;
+ tt.getLocation({
+ type: "wgs84",
+ // isHighAccuracy: true,
+ success: function (res) {
+ console.log(res, 'getLocation')
+ that.setData({
+ latitude: res.latitude,
+ longitude: res.longitude,
+ currentCity: res.city
+ })
+ that.getCouponChannelId(true)
+
+ },
+ // 拒绝提供定位权限
+ fail: error => {
+ // that.getCouponChannelId(false)
+ that.setData({
+ isShop: false,
+ mallList: []
+ })
+ tt.hideLoading();
+ },
+ complete: finish => {
+ const city = that.data.currentCity
+ if (!city) {
+ tt.showToast({
+ title: "定位失败!",
+ icon: "fail"
+ });
+ }
+ }
+ })
+ },
+
+ dealMallList() {
+ const that = this
+ const latitudeNow = that.data.latitude
+ const longitudeNow = that.data.longitude
+
+ const mallLocationArr = []
+ const mallList = that.data.mallList
+ mallList.forEach((item, index) => {
+ const obj = {
+ latitude: item.latitude || false,
+ longitude: item.longitude || false,
+ id: item.id,
+ index: index
+ }
+ mallLocationArr.push(obj)
+ })
+ console.log(mallLocationArr, 'mallLocationArr');
+
+ const tempArr = mallList
+ const bloobArr = []
+
+ mallLocationArr.forEach((item, index) => {
+ const distanceData = that.getDistances(latitudeNow, longitudeNow, item.latitude, item.longitude)
+ tempArr[index].distance_str = distanceData.distance_str
+ tempArr[index].distanceName = tempArr[index].merchantName + ' ' + distanceData.distance_str
+ tempArr[index].distance = distanceData.distance
+ bloobArr.push(tempArr[index])
+ })
+
+ const finalSortMallList = that.bloob(bloobArr)
+ console.log(finalSortMallList, 'finalSortMallList');
+ that.setData({
+ mallList: finalSortMallList
+ })
+ },
+
+ /**
+ * @description:根据经纬度计算距离
+ * @param {*} locationInfo (lat1, lng1, lat2, lng2)
+ * @return: distanceObj: { distance , distance_str }
+ */
+ getDistances(lat1, lng1, lat2, lng2) {
+
+ if (lat2 || lng2) {
+ function rad(num) {
+ return num * Math.PI / 180.0;
+ }
+ var radLat1 = rad(lat1);
+ var radLat2 = rad(lat2);
+ var a = radLat1 - radLat2;
+ var b = rad(lng1) - rad(lng2);
+ var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
+ Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)));
+ s = s * 6378.137;
+ s = Math.round(s * 10000) / 10000;
+
+ var distance = s;
+ var distance_str = "";
+
+ if (parseInt(distance) >= 1) {
+ distance_str = distance.toFixed(2) + "km";
+ } else if (!arseInt(distance)) {
+ return false
+ } else {
+ distance_str = (distance * 1000).toFixed(2) + "m";
+ }
+
+ let objData = {
+ distance: distance,
+ distance_str: distance_str
+ }
+ return objData
+ } else {
+ let objData = {
+ distance: Infinity,
+ distance_str: ''
+ }
+ return objData
+ }
+
+ },
+
+ bloob(arr) {
+ const tempArr = arr
+ for (let i = 0; i < tempArr.length - 1; i++) {
+ for (let j = 0; j < tempArr.length - 1 - i; j++) {
+ if (tempArr[j].distance > tempArr[j + 1].distance) {
+ let temp = tempArr[j];
+ tempArr[j] = tempArr[j + 1];
+ tempArr[j + 1] = temp;
+ }
+ }
+ }
+ return tempArr
},
selectCity() {
@@ -31,19 +285,32 @@ Page({
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
- });
- },
- });
+ const id = e.target.id
+ that.setData({
+ currentTag: id,
+ toView: id
+ })
+
},
+
+ goSetShop(e) {
+ const item = e.currentTarget.dataset.item
+ console.log(item, 'item');
+ app.globalData.shopItem = item
+ tt.navigateBack();
+ },
+
+ goFindShop(e) {
+ const name = e.currentTarget.dataset.name
+ this.setData({
+ currentCity: name,
+ mallList: [],
+ isShop: true
+ })
+ tt.showLoading({
+ title: '加载中...',
+ });
+ this.getCouponChannelId(false)
+ },
})
\ No newline at end of file
diff --git a/pages2/shopSelect/shopSelect.json b/pages2/shopSelect/shopSelect.json
index 3928faa..080fccd 100644
--- a/pages2/shopSelect/shopSelect.json
+++ b/pages2/shopSelect/shopSelect.json
@@ -1,3 +1,6 @@
{
+ "navigationBarTitleText": "门店选择",
+ "navigationBarBackgroundColor": "#fff",
+ "navigationBarTextStyle": "black",
"usingComponents": {}
}
\ No newline at end of file
diff --git a/pages2/shopSelect/shopSelect.less b/pages2/shopSelect/shopSelect.less
index 2ec1d47..80b33ab 100644
--- a/pages2/shopSelect/shopSelect.less
+++ b/pages2/shopSelect/shopSelect.less
@@ -3,6 +3,7 @@ page {
font-size: 30rpx;
box-sizing: border-box !important;
background-color: #fff;
+ padding-bottom: 0;
.continer {
width: 95%;
@@ -47,6 +48,13 @@ page {
.img {
width: 30%;
height: 170rpx;
+ border-radius: 15rpx;
+ overflow: hidden;
+
+ image {
+ width: 100%;
+ height: 100%;
+ }
}
.infoBox {
@@ -64,6 +72,33 @@ page {
text-overflow: ellipsis;
}
}
+
+ .infoBox2 {
+ display: flex;
+ justify-content: space-between;
+ flex-direction: column;
+ width: 65%;
+ margin-left: 20rpx;
+ padding: 30rpx 0;
+
+ .infoItem {
+ width: 100%;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+ }
+ }
+
+ .takeingPlace {
+ text-align: center;
+ margin-top: 30rpx;
+
+ .title {
+ font-size: 45rpx;
+ color: #00000075;
+ margin-bottom: 40rpx;
+ }
}
}
}
@@ -82,11 +117,34 @@ page {
border-radius: 15rpx;
}
}
+
+ .notice {
+ font-size: 40rpx;
+ padding: 0 15rpx;
+ margin-bottom: 30rpx;
+ }
+
+ .indexList {
+ padding: 0 15rpx;
+ box-sizing: border-box;
+ margin-bottom: 25rpx;
+
+ .title {
+ font-size: 40rpx;
+ }
+
+ .item {
+ font-size: 36rpx;
+ height: 80rpx;
+ line-height: 80rpx;
+ border-bottom: 1px solid #0000003b;
+ }
+ }
}
.indexBar {
position: fixed;
- top: 10%;
+ top: 5%;
right: 3%;
font-size: 25rpx;
text-align: center;
@@ -96,14 +154,48 @@ page {
border-radius: 30rpx;
.indexBarItem {
+ position: relative;
width: 50rpx;
+ height: 42rpx;
color: #ffffff;
- margin-bottom: 10rpx;
transition: all 0.3s;
&.active {
color: #f92672;
}
+
+ .tag {
+ position: absolute;
+ left: -210%;
+ top: 0;
+ width: 110rpx;
+ height: 60rpx;
+ text-align: center;
+ transform: scale(1.3);
+ }
+
+ .name {
+ position: relative;
+ top: -11rpx;
+ left: 10rpx;
+ display: inline-block;
+ height: 50rpx;
+ line-height: 50rpx;
+ color: #ffffff;
+ background-color: #8a8a8a;
+ border-radius: 15rpx;
+ padding: 0 20rpx;
+ }
+
+ .tran {
+ display: inline-block;
+ width: 0;
+ height: 0;
+ border-top: 20rpx solid #ffffff00;
+ border-bottom: 20rpx solid #ffffff00;
+ border-left: 20rpx solid #8a8a8a;
+ border-right: 20rpx solid #ffffff00;
+ }
}
}
}
diff --git a/pages2/shopSelect/shopSelect.ttml b/pages2/shopSelect/shopSelect.ttml
index 6508779..04df0b4 100644
--- a/pages2/shopSelect/shopSelect.ttml
+++ b/pages2/shopSelect/shopSelect.ttml
@@ -2,17 +2,32 @@
- 当前城市:武汉
+ 当前城市:{{ currentCity }}
+ 定位失败
切换城市
-
-
-
-
- 家帮汇沧州店
- 地址:湖北省汉川市仙女山街道办事处仙女大道100号1栋城北建筑公司1单元501室
- 距您0.2km
+
+
+
+
+
+ {{ item.merchantName }}
+ 地址:{{ item.addr }}
+ 距您 {{ item.distance_str }}
+
+
+
+ {{ item.merchantName }}
+ 地址:{{ item.addr }}
+
+
+
+
+
+
+ 该城市暂无可用门店哦
+
@@ -21,10 +36,30 @@
返回
+
+ 请选择您所在城市
+
+
+
+ {{ item }}
+ 北京市
+ 武汉市
+ 天津市
+ 石家庄市
+ 济南市
+ 长沙市
+
+
+
{{
- item }}
+ tt:key="index" id="{{ item }}" bindtap="tagBind">{{ item }}
+
+ {{ item }}
+
+
+
\ No newline at end of file
diff --git a/pages2/shopSelect/shopSelect.ttss b/pages2/shopSelect/shopSelect.ttss
index 9455883..95998a7 100644
--- a/pages2/shopSelect/shopSelect.ttss
+++ b/pages2/shopSelect/shopSelect.ttss
@@ -3,6 +3,7 @@ page {
font-size: 30rpx;
box-sizing: border-box !important;
background-color: #fff;
+ padding-bottom: 0;
}
page .continer {
width: 95%;
@@ -44,6 +45,12 @@ page .continer .selectShop .shopList .item {
page .continer .selectShop .shopList .item .img {
width: 30%;
height: 170rpx;
+ border-radius: 15rpx;
+ overflow: hidden;
+}
+page .continer .selectShop .shopList .item .img image {
+ width: 100%;
+ height: 100%;
}
page .continer .selectShop .shopList .item .infoBox {
display: flex;
@@ -59,6 +66,29 @@ page .continer .selectShop .shopList .item .infoBox .infoItem {
overflow: hidden;
text-overflow: ellipsis;
}
+page .continer .selectShop .shopList .item .infoBox2 {
+ display: flex;
+ justify-content: space-between;
+ flex-direction: column;
+ width: 65%;
+ margin-left: 20rpx;
+ padding: 30rpx 0;
+}
+page .continer .selectShop .shopList .item .infoBox2 .infoItem {
+ width: 100%;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+page .continer .selectShop .shopList .takeingPlace {
+ text-align: center;
+ margin-top: 30rpx;
+}
+page .continer .selectShop .shopList .takeingPlace .title {
+ font-size: 45rpx;
+ color: #00000075;
+ margin-bottom: 40rpx;
+}
page .continer .selectCity .nav {
margin-bottom: 20rpx;
padding: 0 20rpx;
@@ -71,9 +101,28 @@ page .continer .selectCity .nav .item {
background-image: linear-gradient(to top, #48c6ef 0%, #6f86d6 100%);
border-radius: 15rpx;
}
+page .continer .selectCity .notice {
+ font-size: 40rpx;
+ padding: 0 15rpx;
+ margin-bottom: 30rpx;
+}
+page .continer .selectCity .indexList {
+ padding: 0 15rpx;
+ box-sizing: border-box;
+ margin-bottom: 25rpx;
+}
+page .continer .selectCity .indexList .title {
+ font-size: 40rpx;
+}
+page .continer .selectCity .indexList .item {
+ font-size: 36rpx;
+ height: 80rpx;
+ line-height: 80rpx;
+ border-bottom: 1px solid #0000003b;
+}
page .continer .indexBar {
position: fixed;
- top: 10%;
+ top: 5%;
right: 3%;
font-size: 25rpx;
text-align: center;
@@ -83,11 +132,42 @@ page .continer .indexBar {
border-radius: 30rpx;
}
page .continer .indexBar .indexBarItem {
+ position: relative;
width: 50rpx;
+ height: 42rpx;
color: #ffffff;
- margin-bottom: 10rpx;
transition: all 0.3s;
}
page .continer .indexBar .indexBarItem.active {
color: #f92672;
}
+page .continer .indexBar .indexBarItem .tag {
+ position: absolute;
+ left: -210%;
+ top: 0;
+ width: 110rpx;
+ height: 60rpx;
+ text-align: center;
+ transform: scale(1.3);
+}
+page .continer .indexBar .indexBarItem .name {
+ position: relative;
+ top: -11rpx;
+ left: 10rpx;
+ display: inline-block;
+ height: 50rpx;
+ line-height: 50rpx;
+ color: #ffffff;
+ background-color: #8a8a8a;
+ border-radius: 15rpx;
+ padding: 0 20rpx;
+}
+page .continer .indexBar .indexBarItem .tran {
+ display: inline-block;
+ width: 0;
+ height: 0;
+ border-top: 20rpx solid #ffffff00;
+ border-bottom: 20rpx solid #ffffff00;
+ border-left: 20rpx solid #8a8a8a;
+ border-right: 20rpx solid #ffffff00;
+}
diff --git a/project.private.config.json b/project.private.config.json
index cb8636f..eaf4af0 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -1,7 +1,7 @@
{
"condition": {
"miniprogram": {
- "current": 1688192851587,
+ "current": -1,
"list": [
{
"id": 1678508631604,
@@ -58,10 +58,10 @@
"location": "audit"
},
{
- "id": 1688192851587,
+ "id": 1688290922168,
"name": "pages2/shopSelect/shopSelect",
"pathName": "pages2/shopSelect/shopSelect",
- "query": "",
+ "query": "id=835370938545004544&orderId=835370938545004544&merOrderId=835370895208669184&startTime=2023-07-02&endTime=2023-08-30",
"scene": "990001",
"launchFrom": "scan",
"location": "qr_code"