HolyKnightIX 1 год назад
Родитель
Сommit
098da830b6
13 измененных файлов: 49 добавлений и 16 удалений
  1. +3
    -2
      app.json
  2. +3
    -3
      pages/order/detail/index.js
  3. +2
    -2
      pages/order/detail/index.ttml
  4. +10
    -4
      pages2/appointment/appointment.js
  5. +0
    -0
      pages2/appointment/appointment.json
  6. +9
    -0
      pages2/appointment/appointment.ttml
  7. +0
    -0
      pages2/appointment/appointment.ttss
  8. +9
    -0
      pages2/shopSelect/shopSelect.js
  9. +3
    -0
      pages2/shopSelect/shopSelect.json
  10. +2
    -0
      pages2/shopSelect/shopSelect.ttml
  11. +1
    -0
      pages2/shopSelect/shopSelect.ttss
  12. +5
    -5
      project.private.config.json
  13. +2
    -0
      utils/util.js

+ 3
- 2
app.json Просмотреть файл

@@ -44,9 +44,10 @@
"pages/freeBannerDetail/freeBannerDetail"
],
"subpackages": [{
"root": "package2",
"root": "pages2",
"pages": [
"pages/appointment/appointment"
"appointment/appointment",
"shopSelect/shopSelect"
]
}],
"window": {


+ 3
- 3
pages/order/detail/index.js Просмотреть файл

@@ -193,7 +193,7 @@ Page({
console.log(startTime, endTime);

tt.navigateTo({
url: `/package2/pages/appointment/appointment?id=${id}&orderId=${orderId}&merOrderId=${merOrderId}&startTime=${startTime}&endTime=${endTime}`,
url: `/pages2/appointment/appointment?id=${id}&orderId=${orderId}&merOrderId=${merOrderId}&startTime=${startTime}&endTime=${endTime}`,
});
},

@@ -208,8 +208,8 @@ Page({
}).then(res => {
console.log(res, 'getUserReservation');
if (res.data) {
const appointStart = util.timestampToTime(res.data.startDate, 'YYYY-MM-DD hh:mm:ss')
const appointEnd = util.timestampToTime(res.data.endDate, 'hh:mm:ss')
const appointStart = util.timestampToTime(res.data.startDate, 'YYYY-MM-DD hh:mm')
const appointEnd = util.timestampToTime(res.data.endDate, 'hh:mm')
console.log(appointStart, appointEnd);
const appointmentId = res.data.id
const appointmentStatus = res.data.status


+ 2
- 2
pages/order/detail/index.ttml Просмотреть файл

@@ -120,8 +120,8 @@
<text class="fl">预约时间:</text>

<text tt:if="{{ !isAppointment }}" class="fr" style="color: #d4a971;">点击预约</text>
<text tt:if="{{ isAppointment && appointmentStatus == 0 }}" class="fr"
style="color: #d4a971">{{appointStart}}-{{appointEnd}}</text>
<text tt:if="{{ isAppointment && appointmentStatus == 0 }}" class="fr" style="color: #d4a971">{{appointStart }}{{
' - ' }}{{ appointEnd}}</text>
<text
tt:if="{{ isAppointment && ( appointmentStatus == 1 || appointmentStatus == 2 || appointmentStatus == 3 ) }}"
class="fr" style="color: #d4a971;">预约已取消


package2/pages/appointment/appointment.js → pages2/appointment/appointment.js Просмотреть файл

@@ -1,9 +1,9 @@
// c:\Users\Holy-Knight-IX\Desktop\Working Space\4.TikTok-MiniPro\ttc\package2\pages\appointment\appointment.js
let config = require("../../../config/config.js");
let util = require("../../../utils/util");
let Http = require("../../../utils/HttpBasics");
let config = require("../../config/config.js");
let util = require("../../utils/util");
let Http = require("../../utils/HttpBasics");
let app = getApp();
const imgurl = require("../../../utils/imgurl");
const imgurl = require("../../utils/imgurl");
Page({
data: {
appointmentText: "确认预约",
@@ -211,6 +211,12 @@ Page({
})
},

goSelectShop() {
tt.navigateTo({
url: `/pages2/shopSelect/shopSelect`
});
},

chooseAddress() {
if (!this.data.isShowBtns) return
let that = this;

package2/pages/appointment/appointment.json → pages2/appointment/appointment.json Просмотреть файл


package2/pages/appointment/appointment.ttml → pages2/appointment/appointment.ttml Просмотреть файл

@@ -58,6 +58,15 @@
</picker>
</view>

<view class="addressPickerFlex" bindtap="goSelectShop">
<text>选择可用商户(BETA):</text>

<view class="pickerInside">
请选择
</view>

</view>

<view class="describeTextarea">
<textarea class="describe" placeholder="备注:说点什么吧" disabled="{{ !isShowBtns }}" bindinput="describing"
value="{{ describeStr }}"></textarea>

package2/pages/appointment/appointment.ttss → pages2/appointment/appointment.ttss Просмотреть файл


+ 9
- 0
pages2/shopSelect/shopSelect.js Просмотреть файл

@@ -0,0 +1,9 @@
// c:\Users\56817\Desktop\Working Space\3,TikTok-MiniPro\ttc\pages2\shopSelect\shopSelect.js
Page({
data: {

},
onLoad: function (options) {

}
})

+ 3
- 0
pages2/shopSelect/shopSelect.json Просмотреть файл

@@ -0,0 +1,3 @@
{
"usingComponents": {}
}

+ 2
- 0
pages2/shopSelect/shopSelect.ttml Просмотреть файл

@@ -0,0 +1,2 @@
<!-- c:\Users\56817\Desktop\Working Space\3,TikTok-MiniPro\ttc\pages2\shopSelect\shopSelect.ttml -->
<text>c:\Users\56817\Desktop\Working Space\3,TikTok-MiniPro\ttc\pages2\shopSelect\shopSelect.ttml</text>

+ 1
- 0
pages2/shopSelect/shopSelect.ttss Просмотреть файл

@@ -0,0 +1 @@
/* c:\Users\56817\Desktop\Working Space\3,TikTok-MiniPro\ttc\pages2\shopSelect\shopSelect.ttss */

+ 5
- 5
project.private.config.json Просмотреть файл

@@ -1,7 +1,7 @@
{
"condition": {
"miniprogram": {
"current": -1,
"current": 1688143362650,
"list": [
{
"id": 1678508631604,
@@ -58,10 +58,10 @@
"location": "audit"
},
{
"id": 1687681696486,
"name": "package2/pages/appointment/appointment",
"pathName": "package2/pages/appointment/appointment",
"query": "id=&orderId=832862588988481536&startTime=1687622400000&endTime=2023-06-30&mallList=%255B%257B%2522tenantId%2522%253A%25221040%2522%252C%2522mallName%2522%253A%2522%25E5%25AF%258C%25E8%258C%2582%25E5%25AE%25B6%25E6%2594%25BF%2522%252C%2522merchantVoList%2522%253A%255B%257B%2522merchantStatus%2522%253A1%252C%2522shopVoList%2522%253A%255B%257B%2522imgUrl%2522%253A%2522https%253A%252F%252Fformall.oss-accelerate.aliyuncs.com%252F234%252FWechatIMG5071.png%2522%252C%2522buildingName%2522%253A%2522%25E5%25AF%258C%25E8%258C%2582%25E5%25AE%25B6%25E6%2594%25BF%2522%252C%2522linkPhone%2522%253A%2522%2522%252C%2522shopNumber%2522%253A%2522001%2522%252C%2522id%2522%253A%2522828071776068100096%2522%252C%2522floorName%2522%253A%25221F%2522%252C%2522floor%2522%253A%2522825939503087149056%2522%252C%2522addr%2522%253A%2522%2522%252C%2522linkPerson%2522%253A%2522%2522%252C%2522building%2522%253A%2522825939503074566144%2522%257D%255D%252C%2522latitude%2522%253A%252230.277748%2522%252C%2522businessId%2522%253A6%252C%2522supplierExtId%2522%253A%2522828072047632506880%2522%252C%2522isAdmin%2522%253A0%252C%2522merchantName%2522%253A%2522%25E5%25AE%25B6%25E5%25B8%25AE%25E6%25B1%2587%25E5%25AE%25B6%25E6%2594%25BF%25E4%25BF%259D%25E6%25B4%2581%28%25E6%25B2%25B3%25E6%25B1%25A0%25E5%25B8%2582%25E5%25BA%2586%25E8%25BF%259C%25E9%2595%2587%29%2522%252C%2522ttPoi%2522%253A%25227241459164742944771%2522%252C%2522merchantImgUrl%2522%253A%2522https%253A%252F%252Fformall.oss-accelerate.aliyuncs.com%252F234%252FWechatIMG5071.png%2522%252C%2522merchantLinkPhone%2522%253A%252218988778877%2522%252C%2522parameter%2522%253A%2522%257B%255C%2522subsidyNumStr%255C%2522%253A%25200%257D%2522%252C%2522tenantId%2522%253A%25221040%2522%252C%2522finalTenantId%2522%253A%25221040%2522%252C%2522id%2522%253A%2522828072047632506880%2522%252C%2522longitude%2522%253A%2522119.996078%2522%257D%255D%252C%2522expand%2522%253Atrue%257D%255D",
"id": 1688143362650,
"name": "pages2/shopSelect/shopSelect",
"pathName": "pages2/shopSelect/shopSelect",
"query": "",
"scene": "990001",
"launchFrom": "scan",
"location": "qr_code"


+ 2
- 0
utils/util.js Просмотреть файл

@@ -151,6 +151,8 @@ function timestampToTime(timestamp, format) {
// return Y + M + D + h + m + s
if (format == "YYYY-MM-DD hh:mm:ss") {
return Y + "-" + M + "-" + D + " " + h + ":" + m + ":" + s
} else if (format == "YYYY-MM-DD hh:mm") {
return Y + "-" + M + "-" + D + " " + h + ":" + m
} else if (format == "YYYY/MM/DD hh:mm:ss") {
return Y + "/" + M + "/" + D + " " + h + ":" + m + ":" + s
} else if (format == "YYYY.MM.DD hh:mm:ss") {


Загрузка…
Отмена
Сохранить