xt / xcx-book · Commits

Go to a project

Commit 3080a5f9acd9901607fb6dbf6c9a5f2d142b16b2

Authored by vking
2 parents 31240465 c4fad94e

Merge remote-tracking branch 'origin/master' into master-boost

Inline Side-by-side
Showing 8 changed files with 10 additions and 10 deletions
... ... @@ -37,8 +37,8 @@ Component({
methods: {
onpos(e){
let location=e.detail
location.latitude=39.6242016100
location.longitude=118.1174469000
//location.latitude=39.6242016100
//location.longitude=118.1174469000
//console.log('hasActivity',location);
if(location.latitude && location.longitude){
TSPOS.latitude.push(location.latitude)
... ...
<!--pack-book/pages/checkout/index.wxml-->
<wxs src="../../../utils/util.wxs" module="util" />
<nav hasHome backgroundColor="#199095" color="#fefefe">{{title||'提前买单'}}</nav>
<nav hasHome backgroundColor="#199095" color="#fefefe">{{title||'在线买单'}}</nav>
<view class="pages flex-vc">
<block wx:if="{{detail.order_info.status>1}}">
<view class="block payinfo">
... ...
... ... @@ -14,7 +14,7 @@ Component({
steps:[
{number:1,txt:'获取消费金额'},
{number:2,txt:'商家反馈消费金额'},
{number:3,txt:'提前买单'},
{number:3,txt:'在线买单'},
],
},
... ...
... ... @@ -46,7 +46,7 @@
<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 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>
... ...
... ... @@ -7,7 +7,7 @@ page{
padding: 204rpx 0 60rpx;
background-size: 100% auto;
background-repeat: no-repeat;
background-image: url("http://nosqn.colorcun.com/checkout/images/3.png");
background-image: url("http://nosqn.colorcun.com/checkout/images/online-buy.png");
}
.content{
width: calc(100% - 40rpx);
... ...
... ... @@ -321,7 +321,7 @@ Page({
if(this.data.detail.status==0){
this.selectComponent('#showModal').options({
header: '商家未确认',
body: '确认后，到店消费可提前买单'
body: '确认后，到店消费可在线买单'
}).show();
}else{
wx.navigateTo({
... ...
... ... @@ -49,7 +49,7 @@
share-act="invitation"
class="share-but-view">
<view class="share-but Regular">
提前买单
在线买单
<seller-discount id="seller-discount" seller="{{detail.seller}}" wx:if="{{detail.seller}}"
cla="money-tips detail_owner"></seller-discount>
</view>
... ... @@ -119,7 +119,7 @@
<view class="share-but Regular">
<view class="flex-cc">
<view class="checkout-icon checkout-icon-{{checkout.status}}" wx:if="{{checkout}}"></view>
提前买单
在线买单
</view>
<seller-discount id="seller-discount" seller="{{detail.seller}}" wx:if="{{detail.seller}}"
cla="money-tips detail_owner"></seller-discount>
... ...
... ... @@ -35,7 +35,7 @@
<navigator
wx:if="{{detail.bill_status!=3 && detail.seller.isopen_md==1}}"
url="/pack-checkout/pages/index?rid={{detail.id}}&sid={{detail.seller.id}}">
<view class="opt-button">提前买单</view>
<view class="opt-button">在线买单</view>
</navigator>
</view>
<userinfo-share wx:else="{{}}"
... ...