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({ @@ -37,8 +37,8 @@ Component({
37 methods: { 37 methods: {
38 onpos(e){ 38 onpos(e){
39 let location=e.detail 39 let location=e.detail
40 - location.latitude=39.6242016100  
41 - location.longitude=118.1174469000 40 + //location.latitude=39.6242016100
  41 + //location.longitude=118.1174469000
42 //console.log('hasActivity',location); 42 //console.log('hasActivity',location);
43 if(location.latitude && location.longitude){ 43 if(location.latitude && location.longitude){
44 TSPOS.latitude.push(location.latitude) 44 TSPOS.latitude.push(location.latitude)
1 <!--pack-book/pages/checkout/index.wxml--> 1 <!--pack-book/pages/checkout/index.wxml-->
2 <wxs src="../../../utils/util.wxs" module="util" /> 2 <wxs src="../../../utils/util.wxs" module="util" />
3 -<nav hasHome backgroundColor="#199095" color="#fefefe">{{title||'提前买单'}}</nav> 3 +<nav hasHome backgroundColor="#199095" color="#fefefe">{{title||'在线买单'}}</nav>
4 <view class="pages flex-vc"> 4 <view class="pages flex-vc">
5 <block wx:if="{{detail.order_info.status>1}}"> 5 <block wx:if="{{detail.order_info.status>1}}">
6 <view class="block payinfo"> 6 <view class="block payinfo">
@@ -14,7 +14,7 @@ Component({ @@ -14,7 +14,7 @@ Component({
14 steps:[ 14 steps:[
15 {number:1,txt:'获取消费金额'}, 15 {number:1,txt:'获取消费金额'},
16 {number:2,txt:'商家反馈消费金额'}, 16 {number:2,txt:'商家反馈消费金额'},
17 - {number:3,txt:'提前买单'}, 17 + {number:3,txt:'在线买单'},
18 ], 18 ],
19 }, 19 },
20 20
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 <view class="jinduBar--bottom jinduBar--flex-lr"> 46 <view class="jinduBar--bottom jinduBar--flex-lr">
47 <view class="jinduBar--bottom-txt sk-transparent sk-text-15-0000-926 sk-text" style="background-size: 100% 1.25rem;">获取消费金额</view> 47 <view class="jinduBar--bottom-txt sk-transparent sk-text-15-0000-926 sk-text" style="background-size: 100% 1.25rem;">获取消费金额</view>
48 <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> 48 <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>
49 - <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> 49 + <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>
50 </view> 50 </view>
51 </view> 51 </view>
52 </view> 52 </view>
@@ -7,7 +7,7 @@ page{ @@ -7,7 +7,7 @@ page{
7 padding: 204rpx 0 60rpx; 7 padding: 204rpx 0 60rpx;
8 background-size: 100% auto; 8 background-size: 100% auto;
9 background-repeat: no-repeat; 9 background-repeat: no-repeat;
10 - background-image: url("http://nosqn.colorcun.com/checkout/images/3.png"); 10 + background-image: url("http://nosqn.colorcun.com/checkout/images/online-buy.png");
11 } 11 }
12 .content{ 12 .content{
13 width: calc(100% - 40rpx); 13 width: calc(100% - 40rpx);
@@ -321,7 +321,7 @@ Page({ @@ -321,7 +321,7 @@ Page({
321 if(this.data.detail.status==0){ 321 if(this.data.detail.status==0){
322 this.selectComponent('#showModal').options({ 322 this.selectComponent('#showModal').options({
323 header: '商家未确认', 323 header: '商家未确认',
324 - body: '确认后，到店消费可提前买单' 324 + body: '确认后，到店消费可在线买单'
325 }).show(); 325 }).show();
326 }else{ 326 }else{
327 wx.navigateTo({ 327 wx.navigateTo({
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 share-act="invitation" 49 share-act="invitation"
50 class="share-but-view"> 50 class="share-but-view">
51 <view class="share-but Regular"> 51 <view class="share-but Regular">
52 - 提前买单 52 + 在线买单
53 <seller-discount id="seller-discount" seller="{{detail.seller}}" wx:if="{{detail.seller}}" 53 <seller-discount id="seller-discount" seller="{{detail.seller}}" wx:if="{{detail.seller}}"
54 cla="money-tips detail_owner"></seller-discount> 54 cla="money-tips detail_owner"></seller-discount>
55 </view> 55 </view>
@@ -119,7 +119,7 @@ @@ -119,7 +119,7 @@
119 <view class="share-but Regular"> 119 <view class="share-but Regular">
120 <view class="flex-cc"> 120 <view class="flex-cc">
121 <view class="checkout-icon checkout-icon-{{checkout.status}}" wx:if="{{checkout}}"></view> 121 <view class="checkout-icon checkout-icon-{{checkout.status}}" wx:if="{{checkout}}"></view>
122 - 提前买单 122 + 在线买单
123 </view> 123 </view>
124 <seller-discount id="seller-discount" seller="{{detail.seller}}" wx:if="{{detail.seller}}" 124 <seller-discount id="seller-discount" seller="{{detail.seller}}" wx:if="{{detail.seller}}"
125 cla="money-tips detail_owner"></seller-discount> 125 cla="money-tips detail_owner"></seller-discount>
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 <navigator 35 <navigator
36 wx:if="{{detail.bill_status!=3 && detail.seller.isopen_md==1}}" 36 wx:if="{{detail.bill_status!=3 && detail.seller.isopen_md==1}}"
37 url="/pack-checkout/pages/index?rid={{detail.id}}&sid={{detail.seller.id}}"> 37 url="/pack-checkout/pages/index?rid={{detail.id}}&sid={{detail.seller.id}}">
38 - <view class="opt-button">提前买单</view> 38 + <view class="opt-button">在线买单</view>
39 </navigator> 39 </navigator>
40 </view> 40 </view>
41 <userinfo-share wx:else="{{}}" 41 <userinfo-share wx:else="{{}}"