xt / xcx-book · Commits

Go to a project

Commit d07b6ac57ebe8d2d24d9b5c51498384557297569

Authored by vking
1 parent 3b244e0b
build: skipped

pay

Inline Side-by-side
Showing 7 changed files with 236 additions and 39 deletions
... ... @@ -2,7 +2,7 @@
<view class="jindu-view">
<view class="tips-info">3步轻松买单</view>
<view class="top flex-lr">
<view class="top-icon flex-vc {{checkout.status>=index?'active':''}}" wx:for="{{steps}}" wx:key="key">
<view class="top-icon flex-vc {{index==0 || checkout.status>=index?'active':''}}" wx:for="{{steps}}" wx:key="key">
<view class="top-icon-txt flex-vc">{{item.number}}</view>
</view>
</view>
... ...
... ... @@ -8,6 +8,7 @@ Page({
*/
data: {
checkout:null,
hasLoading:true,
},
/**
... ... @@ -62,22 +63,25 @@ Page({
GetCheckout(){
App.Customer.GetOrderInfo({rid:this.options.rid}).then(res=>{
let checkout=res.data
let remark=[]
if(res.data.is_wine>0){
remark.push('有剩余酒水要退')
if(checkout){
let remark=[]
if(res.data.is_wine>0){
remark.push('有剩余酒水要退')
}
if(res.data.is_pack>0){
remark.push('菜品打包')
}
checkout.remark=remark.join('、')
if(checkout.status>1){
this.GetOrderInfoStop()
}else{
this.GetOrderInfoRun()
}
}
if(res.data.is_pack>0){
remark.push('菜品打包')
}
checkout.remark=remark.join('、')
this.setData({
checkout:checkout
checkout:checkout,
hasLoading:false,
})
if(checkout.status>1){
this.GetOrderInfoStop()
}else{
this.GetOrderInfoRun()
}
})
},
is_wine:0,
... ...
<!--
此文件为开发者工具生成，生成时间: 2020/4/17 下午2:12:45
使用方法：
1. 在"pack-checkout\pages\index.wxml"中使用`include`指令引入此模板，
2. 在"pack-checkout\pages\index.wxss"中使用`import`指令引入"pack-checkout\pages\index.skeleton.wxss"
3. 书写对应的逻辑，来控制骨架屏的显示与隐藏
更多详细信息可以参考文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/skeleton.html
-->
<view class="sk-container">
<view is="components/nav/nav">
<view class="nav--nav-main-space" style="height: 64px;">
<view class="nav--nav-main" style="background-color: #ffffff;color:#000000;">
<view class="nav--nav" style="margin-top: 20px;">
<view class="nav--flex-lr nav--part" style="height: 44px; line-height: 44px">
<view class="nav--opt nav--flex-ll">
<view class="nav--back nav--flex-vc">
<image class="nav--back-image sk-image"></image>
</view>
</view>
<view class="nav--title sk-transparent sk-text-32-9545-629 sk-text" style="background-size: 32.0285% 2.75rem; background-position-x: 50%;">周到安排</view>
<view class="nav--opt">
<view></view>
</view>
</view>
</view>
</view>
</view>
</view>
<view class="pages sk-image">
<view class="content">
<view is="pack-checkout/components/jinduBar">
<view class="jinduBar--jindu-view">
<view class="jinduBar--tips-info sk-transparent sk-image">3步轻松买单</view>
<view class="jinduBar--top jinduBar--flex-lr sk-pseudo sk-pseudo-circle">
<view class="jinduBar--top-icon jinduBar--flex-vc">
<view class="jinduBar--top-icon-txt jinduBar--flex-vc sk-transparent sk-text-14-2857-157 sk-text" style="background-size: 32.875% 1.225rem;">1</view>
</view>
<view class="jinduBar--top-icon jinduBar--flex-vc">
<view class="jinduBar--top-icon-txt jinduBar--flex-vc sk-transparent sk-text-14-2857-162 sk-text" style="background-size: 32.875% 1.225rem;">2</view>
</view>
<view class="jinduBar--top-icon jinduBar--flex-vc">
<view class="jinduBar--top-icon-txt jinduBar--flex-vc sk-transparent sk-text-14-2857-97 sk-text" style="background-size: 32.875% 1.225rem;">3</view>
</view>
</view>
<view class="jinduBar--bottom jinduBar--flex-lr">
<view class="jinduBar--bottom-txt sk-transparent sk-text-15-0000-926 sk-text" style="background-size: 100% 1.25rem;">获取消费金额</view>
<view class="jinduBar--bottom-txt sk-transparent sk-text-15-0000-606 sk-text" style="background-size: 100% 1.25rem; background-position-x: 50%;">商家反馈消费金额</view>
<view class="jinduBar--bottom-txt sk-transparent sk-text-15-0000-414 sk-text" style="background-size: 100% 1.25rem; background-position-x: 100%;">提前买单</view>
</view>
</view>
</view>
</view>
<checkbox-group>
<view class="content checkout">
<view class="title sk-transparent sk-text-32-5000-940 sk-text" style="border: none; background-size: 35.518% 2.5rem;">买单相关（可选）</view>
<view class="item flex-lr" style="border: none;">
<view class="sk-transparent sk-text-38-4058-984 sk-text" style="background-size: 100% 4.3125rem;">剩余酒水饮料需要退</view>
<checkbox color="#EFEFEF" value="is_wine"></checkbox>
</view>
<view class="item flex-lr" style="border: none;">
<view class="sk-transparent sk-text-38-4058-599 sk-text" style="background-size: 100% 4.3125rem;">菜品打包</view>
<checkbox color="#EFEFEF" value="is_pack"></checkbox>
</view>
</view>
</checkbox-group>
<view class="checkout-get">
<view class="checkout-button sk-transparent">
获取消费金额
<view class="checkout-button-money-tips sk-transparent sk-text-20-5882-11 sk-text" style="background-size: 82.4615% 1.0625rem; background-position-x: 50%;">18.80元红包待用</view>
</view>
</view>
</view>
<view is="components/tips/showModal/showModal" id="showModal">
<view class="showModal--mask showModal--flex-vc showModal--checkout" hidden="true">
<view class="showModal--showModal">
<view class="showModal--header sk-transparent sk-opacity">
确认信息
</view>
<view class="showModal--body sk-transparent sk-opacity">
确认信息
</view>
<view class="showModal--footer showModal--flex-cc"><button plain="true" class="showModal--button-none showModal--confirm showModal--bg-brown sk-transparent sk-button sk-pseudo sk-pseudo-circle" data-type="confirm" style="color: rgb(255, 255, 255); border: none;">知道了</button></view>
</view>
</view>
</view>
</view>
\ No newline at end of file
... ...
/*
此文件为开发者工具生成，生成时间: 2020/4/17 下午2:12:45
使用方法：参考 "pack-checkout\pages\index.skeleton.wxml"
*/
.sk-transparent {
color: transparent !important;
}
.sk-text-32-9545-629 {
background-image: linear-gradient(transparent 32.9545%, #EEEEEE 0%, #EEEEEE 67.0455%, transparent 0%) !important;
background-size: 100% 2.7500rem;
position: relative !important;
}
.sk-text {
background-origin: content-box !important;
background-clip: content-box !important;
background-color: transparent !important;
color: transparent !important;
background-repeat: repeat-y !important;
}
.sk-text-14-2857-157 {
background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
background-size: 100% 1.2250rem;
position: relative !important;
}
.sk-text-14-2857-162 {
background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
background-size: 100% 1.2250rem;
position: relative !important;
}
.sk-text-14-2857-97 {
background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
background-size: 100% 1.2250rem;
position: relative !important;
}
.sk-text-15-0000-926 {
background-image: linear-gradient(transparent 15.0000%, #EEEEEE 0%, #EEEEEE 85.0000%, transparent 0%) !important;
background-size: 100% 1.2500rem;
position: relative !important;
}
.sk-text-15-0000-606 {
background-image: linear-gradient(transparent 15.0000%, #EEEEEE 0%, #EEEEEE 85.0000%, transparent 0%) !important;
background-size: 100% 1.2500rem;
position: relative !important;
}
.sk-text-15-0000-414 {
background-image: linear-gradient(transparent 15.0000%, #EEEEEE 0%, #EEEEEE 85.0000%, transparent 0%) !important;
background-size: 100% 1.2500rem;
position: relative !important;
}
.sk-text-32-5000-940 {
background-image: linear-gradient(transparent 32.5000%, #EEEEEE 0%, #EEEEEE 67.5000%, transparent 0%) !important;
background-size: 100% 2.5000rem;
position: relative !important;
}
.sk-text-38-4058-984 {
background-image: linear-gradient(transparent 38.4058%, #EEEEEE 0%, #EEEEEE 61.5942%, transparent 0%) !important;
background-size: 100% 4.3125rem;
position: relative !important;
}
.sk-text-38-4058-599 {
background-image: linear-gradient(transparent 38.4058%, #EEEEEE 0%, #EEEEEE 61.5942%, transparent 0%) !important;
background-size: 100% 4.3125rem;
position: relative !important;
}
.sk-text-20-5882-11 {
background-image: linear-gradient(transparent 20.5882%, #EEEEEE 0%, #EEEEEE 79.4118%, transparent 0%) !important;
background-size: 100% 1.0625rem;
position: absolute !important;
}
.sk-opacity {
opacity: 0 !important;
}
.sk-button {
color: #EFEFEF !important;
background: #EFEFEF !important;
border: none !important;
box-shadow: none !important;
}
.sk-image {
background: #EFEFEF !important;
}
.sk-pseudo::before, .sk-pseudo::after {
background: #EFEFEF !important;
background-image: none !important;
color: transparent !important;
border-color: transparent !important;
}
.sk-pseudo-rect::before, .sk-pseudo-rect::after {
border-radius: 0 !important;
}
.sk-pseudo-circle::before, .sk-pseudo-circle::after {
border-radius: 50% !important;
}
.sk-container {
position: absolute;
overflow: hidden;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 1000000;
background-color: transparent;
}
... ...
<!--pack-activity/pages/index.wxml-->
<wxs src="../../utils/util.wxs" module="util" />
<block wx:if="{{hasLoading}}">
<include src="./index.skeleton.wxml"></include>
</block>
<nav hasHome>{{checkout.sellername||'周到安排'}}</nav>
<view class="pages">
<view class="content">
<jinduBar checkout="{{checkout}}"></jinduBar>
</view>
<!--//买单相关（可选）-->
<block wx:if="{{checkout.status<1}}">
<checkbox-group bindchange="checkoutData">
<view class="content checkout">
<view class="title">买单相关（可选）</view>
<view class="item flex-lr">
<view>剩余酒水饮料需要退</view>
<checkbox color="#ffffff" value="is_wine"/>
</view>
<view class="item flex-lr">
<view>菜品打包</view>
<checkbox color="#ffffff" value="is_pack"/>
</view>
</view>
</checkbox-group>
<view class="checkout-get" bindtap="checkoutInit">
<view class="checkout-button">
获取消费金额
<view class="checkout-button-money-tips" wx:if="{{user.price>0}}">{{user.price}}元红包待用</view>
</view>
</view>
</block>
<block wx:elif="{{checkout.status==1}}">
<block wx:if="{{checkout.status==1}}">
<view class="content checkout">
<view class="waiting-money flex-vc">
<icon type="waiting" size="47" color="#C0A369"/>
... ... @@ -84,7 +65,7 @@
</view>
<view class="money-tips">注：消费清单，离店时请到前台索要；</view>
</block>
<block wx:else="">
<block wx:elif="{{checkout.status==3}}">
<view class="content money">
<view class="waiting-money flex-vc">
<icon type="success" size="47" color="#C8B16D"/>
... ... @@ -131,5 +112,26 @@
</view>
</view>
</block>
<block wx:else="">
<checkbox-group bindchange="checkoutData">
<view class="content checkout">
<view class="title">买单相关（可选）</view>
<view class="item flex-lr">
<view>剩余酒水饮料需要退</view>
<checkbox color="#ffffff" value="is_wine"/>
</view>
<view class="item flex-lr">
<view>菜品打包</view>
<checkbox color="#ffffff" value="is_pack"/>
</view>
</view>
</checkbox-group>
<view class="checkout-get" bindtap="checkoutInit">
<view class="checkout-button">
获取消费金额
<view class="checkout-button-money-tips" wx:if="{{user.price>0}}">{{user.price}}元红包待用</view>
</view>
</view>
</block>
</view>
<showModal id="showModal" confirmText="知道了" bindshowModal="showModal" cla="checkout"></showModal>
\ No newline at end of file
... ...
/* pack-activity/pages/index.wxss */
@import "index.skeleton.wxss";
page{
background-color: #F5F5F5;
}
... ...
... ... @@ -644,7 +644,7 @@
"id": 80,
"name": "pack-checkout/pages/index",
"pathName": "pack-checkout/pages/index",
"query": "rid=60472&sid=80",
"query": "rid=61685&sid=80",
"scene": null
}
]
... ...