From e55f5806a28f7b6b860335c00e24ddbe7a5527e3 Mon Sep 17 00:00:00 2001 From: YWQ HK IX <568170040@qq.com> Date: Wed, 30 Nov 2022 18:03:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E3=80=81=E9=80=89=E6=8B=A9=E5=B9=BF=E5=9C=BA=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/coupon/confirmation/confirmation.ttml | 11 +- pages/edit/edit.ttml | 28 +- pages/index/index.js | 47 ++- pages/main/index.js | 6 +- pages/order/detail/index.ttml | 327 ++++++++++---------- pages/order/index/index.ttml | 9 +- pages/order/index/index.ttss | 15 +- project.config.json | 22 +- 8 files changed, 258 insertions(+), 207 deletions(-) diff --git a/pages/coupon/confirmation/confirmation.ttml b/pages/coupon/confirmation/confirmation.ttml index 07d62b5..0a4bf68 100644 --- a/pages/coupon/confirmation/confirmation.ttml +++ b/pages/coupon/confirmation/confirmation.ttml @@ -1,18 +1,19 @@ - + {{data.title}} - {{data.type==50?priceAndStockObj.creditPrice+'积分':'¥'+priceAndStockObj.salePrice/100}} + {{data.type==50?priceAndStockObj.creditPrice+'积分':'¥'+priceAndStockObj.salePrice/100}} + - {{data.subTitle}} + {{data.subTitle}} 实付 - {{data.type!=50?'¥':''}} + {{data.type!=50?'¥':''}} {{data.type==50?priceAndStockObj.creditPrice+'积分':priceAndStockObj.salePrice/100}} {{data.type==50?'立即换购':'提交订单'}} @@ -20,5 +21,5 @@ 使用须知 - + \ No newline at end of file diff --git a/pages/edit/edit.ttml b/pages/edit/edit.ttml index 51ad109..623b547 100644 --- a/pages/edit/edit.ttml +++ b/pages/edit/edit.ttml @@ -9,20 +9,20 @@ 生日 - + {{date}} 身高 - + 体重 - - + + 性别 @@ -33,7 +33,7 @@ - + 住址 {{address}} @@ -46,14 +46,16 @@ 姓名 - + 生日 - - + + {{item.birthdate}} @@ -62,10 +64,10 @@ 性别 - + - + @@ -75,6 +77,8 @@ 删除 - - + + \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index 322e5ce..6b1b37f 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -1,4 +1,3 @@ - const Http = require("../../utils/HttpBasics"); const imgurl = require("../../utils/imgurl"); const config = require("../../config/config"); @@ -7,8 +6,7 @@ Page({ /** * 页面的初始数据 */ - data: { - }, + data: {}, /** * 生命周期函数--监听页面加载 */ @@ -55,6 +53,7 @@ Page({ app.globalData.type = options.type; if (options.type == 'cd') { options.couponChannelId = this.data.newArr[2]; + options.tenantId = this.data.newArr[3]; } else if (options.type == 'bd') { options.bt = this.data.newArr[2]; options.id = this.data.newArr[3]; @@ -109,7 +108,7 @@ Page({ } } }, - getCongig() {//获取小程序是否开通授权手机号 + getCongig() { //获取小程序是否开通授权手机号 Http.get({ url: config.api.getConfig, data: { @@ -135,8 +134,8 @@ Page({ } }, /** - * 获取手机信息 - */ + * 获取手机信息 + */ updateUserInfo() { tt.getSystemInfo({ success: function (res) { @@ -154,25 +153,25 @@ Page({ checkuserstatus(options) { let that = this; console.log("判断是否是商品详情"); - + if ((options && options.couponChannelId && !options.spellGroup && app.globalData.type != 'sd')) { if (options.cuserId) { tt.redirectTo({ - url: `/pages/coupon/detail/index?couponChannelId=${options.couponChannelId}&cuserId=${options.cuserId}&coverImg=${options.coverImg}&userName=${options.userName}&avatarUrl=${options.avatarUrl}&couponOrderId=${options.couponOrderId}&updateDate=${options.updateDate}`, + url: `/pages/coupon/detail/index?couponChannelId=${options.couponChannelId}&cuserId=${options.cuserId}&coverImg=${options.coverImg}&userName=${options.userName}&avatarUrl=${options.avatarUrl}&couponOrderId=${options.couponOrderId}&updateDate=${options.updateDate}&mallTenantId=${options.tenantId}`, }) } else { // 跳转普通券/消费卡/限时秒杀/砍价详情 tt.redirectTo({ - url: `/pages/coupon/detail/index?couponChannelId=${options.couponChannelId}`, + url: `/pages/coupon/detail/index?couponChannelId=${options.couponChannelId}&mallTenantId=${options.tenantId}`, }) } } else { Http.get({ - url: config.api.checkUserStatus, - data: { - token: app.globalData.token - } - }) + url: config.api.checkUserStatus, + data: { + token: app.globalData.token + } + }) .then(res => { // res = JSON.parse('{"code":11004,"message":"用户昵称未授权,请跳转到用户昵称授权页!","data":{}}') //参与拼团 @@ -463,7 +462,7 @@ Page({ tt.redirectTo({ url: `/pages/getuserinfo/getuserinfo?id=${options.id}&frommd=md` }); - }// 门店详情 + } // 门店详情 else if (options && options.id && app.globalData.type == 'md') { tt.redirectTo({ url: `/pages/index/searchbar/detail/index?id=${options.id}` @@ -587,16 +586,16 @@ Page({ getGameOne: function (token, id) { let _this = this; Http.get({ - url: config.api.getOneGame, - data: { - token: token, - id: id - } - }).then(res => { - tt.redirectTo({ - url: '/pages/game/index?url=' + res.data.url + "&id=" + res.data.id + "&gameId=" + res.data.gameId, + url: config.api.getOneGame, + data: { + token: token, + id: id + } + }).then(res => { + tt.redirectTo({ + url: '/pages/game/index?url=' + res.data.url + "&id=" + res.data.id + "&gameId=" + res.data.gameId, + }) }) - }) .catch(err => { tt.showModal({ title: '提示', diff --git a/pages/main/index.js b/pages/main/index.js index 96f68e4..190c59b 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -50,7 +50,7 @@ Page({ that.setData({ newArr: this.data.scene.split(':') }) - + console.log(this.data.newArr); //// 大屏-二维码-start if (this.data.newArr[0] == 'JC') { // 跳转券详情 @@ -65,6 +65,7 @@ Page({ app.globalData.type = options.type; if (options.type == 'cd') { options.couponChannelId = this.data.newArr[2]; + options.tenantId = this.data.newArr[3]; } else if (options.type == 'bd') { options.bt = this.data.newArr[2]; options.id = this.data.newArr[3]; @@ -169,7 +170,8 @@ Page({ Http.get({ url: config.api.checkUserStatus, data: { - token: app.globalData.token + token: app.globalData.token, + mallTenantId: options.tenantId } }) .then(res => { diff --git a/pages/order/detail/index.ttml b/pages/order/detail/index.ttml index 63795d5..b6e6ab0 100644 --- a/pages/order/detail/index.ttml +++ b/pages/order/detail/index.ttml @@ -18,7 +18,7 @@ {{order.title}} - + @@ -35,10 +35,12 @@ 下单时间:{{createDate}} - + - {{order.couponOrderStatus==0?'申请退款':'退款进度'}} + + {{order.couponOrderStatus==0?'申请退款':'退款进度'}} + - - - - - - + + + + + - - - - - - - - 点一点刷新二维码 - - 二维码在 - {{expiredSeconds}}s - 后失效 + + + + + + + + 点一点刷新二维码 + + 二维码在 + {{expiredSeconds}}s + 后失效 + + - - - + - - - - - - - 兑换码: - {{showIdFalg?order.couponOrderId:order.couponOrderIdS}} - - - - + + + 兑换码: + {{showIdFalg?order.couponOrderId:order.couponOrderIdS}} + + + + + - - - - 交易快照:可作为交易争执的判断依据 + + + 交易快照:可作为交易争执的判断依据 + + + + - - - - - - - 订单编号: - {{order.id}} - - - 物流状态: - {{(order.shippingStatus==10||order.shippingStatus==14)?"待自提":order.shippingStatus==15?"已自提":order.shippingStatus==20?"待发货":order.shippingStatus==24?"待收货":order.shippingStatus==25?"已收货":""}} - - - 物流公司: - {{order.deliveryInfo.courierInput}} - - - 快递单号: + + 订单编号: + {{order.id}} + + + 物流状态: + {{(order.shippingStatus==10||order.shippingStatus==14)?"待自提":order.shippingStatus==15?"已自提":order.shippingStatus==20?"待发货":order.shippingStatus==24?"待收货":order.shippingStatus==25?"已收货":""}} + + + 物流公司: + {{order.deliveryInfo.courierInput}} + + + 快递单号: - {{order.deliveryInfo.expressageIdInput}} + {{order.deliveryInfo.expressageIdInput}} - 复制 - 查询物流 - + 复制 + 查询物流 + - - - 实付金额: - - ¥ - {{order.payment/100}} + + 实付金额: + + ¥ + {{order.payment/100}} + - - - - - - 团购详情 - - - - {{item.group_name}} - - - - {{itemChi.name}}({{itemChi.count}}份) - ¥{{itemChi.price/100}} + + + + + 团购详情 + + + + {{item.group_name}} + + + + {{itemChi.name}}({{itemChi.count}}份) + ¥{{itemChi.price/100}} + - - - 购买须知 - 有效期 - • {{order.validStartDate}}至{{order.validEndDate}} - 可用时间 - • 商家营业时间内到店使用 - • 周末不支持使用 - • 节假日(元旦、春节、清明、劳动节、端午节、中秋节、国庆节、情人节、圣诞节)不支持使用 - - 购买限制 - • 每个用户限购{{order.useLimitQuantity}}单 - - 预约消费 - • 无需预约,高峰时段可能等位 - • {{order.subscribeSing}} - - 适用人数 - • 该团购劵最多{{order.rec_person_num_max}}人使用 - - 温馨提示 - • 团购券不支持配送或外卖 - • 该团购商品{{order.pack=='false'?'不支持':'支持'}}打包 - • {{order.besides=="false"?'不可以':'可以'}}外带餐食 - - • {{order.superimposed_discounts=="false"?'不可以':'可以'}}享受店内其他优惠 - • {{order.private_room=="false"?'不可以使用':'可以使用'}}包间 - - 使用规则 - - - - {{item.title}} - {{item.content}} + + 购买须知 + 有效期 + • {{order.validStartDate}}至{{order.validEndDate}} + 可用时间 + • 商家营业时间内到店使用 + • 周末不支持使用 + • 节假日(元旦、春节、清明、劳动节、端午节、中秋节、国庆节、情人节、圣诞节)不支持使用 + + + 购买限制 + • 每个用户限购{{order.useLimitQuantity}}单 + + 预约消费 + • 无需预约,高峰时段可能等位 + • {{order.subscribeSing}} + + 适用人数 + • 该团购劵最多{{order.rec_person_num_max}}人使用 + + 温馨提示 + • 团购券不支持配送或外卖 + • 该团购商品{{order.pack=='false'?'不支持':'支持'}}打包 + • {{order.besides=="false"?'不可以':'可以'}}外带餐食 + + • + {{order.superimposed_discounts=="false"?'不可以':'可以'}}享受店内其他优惠 + • {{order.private_room=="false"?'不可以使用':'可以使用'}}包间 + + 使用规则 + + + + {{item.title}} + {{item.content}} + - - - - - 礼券: - - - - - - {{item.title}} - 面额:{{item.priceStr}}元 + + + + 礼券: + + + + + + {{item.title}} + 面额:{{item.priceStr}}元 + - - - - - - - - + + + - - - 签收 - - 去评价 - 对本订单有疑问或纠纷,请点击下方联系抖音官方客服 - - - 抖音官方客服 - + 签收 + + 去评价 + + 对本订单有疑问或纠纷,请点击下方联系抖音官方客服 + + + 抖音官方客服 + - + @@ -264,4 +275,4 @@ - + \ No newline at end of file diff --git a/pages/order/index/index.ttml b/pages/order/index/index.ttml index 48588c3..885edfd 100644 --- a/pages/order/index/index.ttml +++ b/pages/order/index/index.ttml @@ -13,12 +13,15 @@ - 选择广场 - - 当前广场:{{shopList[index].name}} + + + {{shopList[index].name}} + + + diff --git a/pages/order/index/index.ttss b/pages/order/index/index.ttss index be54854..192874d 100644 --- a/pages/order/index/index.ttss +++ b/pages/order/index/index.ttss @@ -41,7 +41,20 @@ } .picker { - margin-top: 100rpx; + margin-top: 120rpx; + padding: 25rpx 45rpx; + margin-bottom: 28rpx; + background-color: #fff; +} + +.picker .inside { + display: flex; + justify-content: space-between; +} + +.picker .inside .img { + width: 20rpx; + height: 40rpx; } diff --git a/project.config.json b/project.config.json index cd2be60..82eb689 100644 --- a/project.config.json +++ b/project.config.json @@ -23,7 +23,7 @@ "id": 1669558749378, "name": "商品详情页", "pathName": "pages/main/index", - "query": "pages/main/index?type=cd&couponChannelId=756802201412231168&tenantId=1034", + "query": "type=cd&couponChannelId=756802201412231168&tenantId=1034", "scene": "990001", "launchFrom": "scan", "location": "qr_code" @@ -32,7 +32,25 @@ "id": 1669632886124, "name": "商品支付页", "pathName": "pages/main/index", - "query": "pages/main/index?type=orderAffirm&couponChannelId=756802201412231168&tenantId=1034", + "query": "type=orderAffirm&couponChannelId=756802201412231168&tenantId=1034", + "scene": "990001", + "launchFrom": "scan", + "location": "qr_code" + }, + { + "id": 1669798102509, + "name": "二维码进入(index)", + "pathName": "pages/index/index", + "query": "scene=t:cd:756802201412231168:1034", + "scene": "990001", + "launchFrom": "scan", + "location": "qr_code" + }, + { + "id": 1669799932530, + "name": "二维码进入(main)", + "pathName": "pages/main/index", + "query": "scene=t:cd:756802201412231168:1034", "scene": "990001", "launchFrom": "scan", "location": "qr_code"