Leadfyy.co
/
ec.uniapp-master
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/ec.uniapp-master 

# Conflicts:
#	pages/order/confirm/confirm.vue
master
邓平艺 4 years ago
parent
fca8c68aa4 c3624ad8c8
commit
f7bed80832
3 changed files with 29 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      pages/order/confirm/confirm.vue
  2. 4
      pages/order/newdetail/newdetail.vue
  3. 20
      pages/shop/goodsdetail.vue

21
pages/order/confirm/confirm.vue
View File

@ -56,7 +56,7 @@
<view class="lf-font-26 lf-color-333 lf-line-1">{{ item.item_name }}</view>
<view class="lf-font-24 lf-color-777">{{ item.item_meta.specs_text }}</view>
<view class="lf-row-between" style="line-height: 1;">
<text class="price">¥{{ item.total_yuan }}</text>
<text class="price"><text v-if="goods_type==1">¥</text>{{ item.total_yuan }}<text class="lf-font-24" v-if="goods_type==0">积分</text></text>
<text class="lf-font-28 lf-color-777">x {{ item.quantity }}</text>
</view>
</view>
@ -77,7 +77,7 @@
</view>
<view class="lf-row-between lf-m-t-20">
<view class="lf-font-28 lf-color-777">商品金额</view>
<view class="lf-font-26 lf-color-222">¥{{ order_detail.order.items_total_yuan }}</view>
<view class="lf-font-26 lf-color-222"><text v-if="goods_type==1">¥</text>{{ order_detail.order.items_total_yuan }}<text v-if="goods_type==0">积分</text></view>
</view>
<view class="lf-row-between lf-m-t-20" v-if="mode == 0">
<view class="lf-font-28 lf-color-777">运费</view>
@ -94,7 +94,12 @@
<view class="lf-font-24 lf-color-777">共{{ order_detail.order.count }}件</view>
<view class="lf-flex">
<!-- <view class="lf-font-32 lf-color-primary" style="max-width: 400rpx;">合计 ¥{{ order_detail.order.total_yuan }}</view> -->
<view class="lf-font-32 lf-color-primary" style="max-width: 400rpx;">合计 ¥{{ totalPrice }}</view>
<view class="lf-font-32 lf-color-primary" style="max-width: 400rpx;">
<text>合计</text>
<text v-if="goods_type==1">¥</text>
<text>{{ totalPrice }}</text>
<text v-if="goods_type==0">积分</text>
</view>
<view class="confirm-btn" hover-class="lf-opacity" @click="confirm">提交订单</view>
</view>
</view>
@ -116,8 +121,9 @@
<view class="coupon-radius">
<view class="coupon-left">
<view class="lf-font-36 lf-color-white" style="line-height: 1;" v-if="item.discount.action_type.type == 'cash'">
<text>￥</text>
<text v-if="goods_type==1">￥</text>
<text class="lf-font-70 lf-font-bold">{{item.discount.action_type.value}}</text>
<text v-if="goods_type==0">积分</text>
</view>
<view class="lf-font-36 lf-color-white" style="line-height: 1;" v-if="item.discount.action_type.type == 'discount'">
<text class="lf-font-70 lf-font-bold">{{item.discount.action_type.value}}</text>
@ -165,7 +171,8 @@
address_id: null,
order_detail: {coupons: []},
show_coupon: false,
coupon_index: null
coupon_index: null,
goods_type: 1
}
},
computed: {
@ -192,8 +199,10 @@
}
}
},
onLoad(){
onLoad(e){
this.token = this.$cookieStorage.get('user_token');
this.goods_type = e.goods_type;
console.log('积分类型',e)
let options = this.$cookieStorage.get('order_confirm');
if(this.$isRight(options)){
this.orderCheckout(options);

4
pages/order/newdetail/newdetail.vue
View File

@ -18,7 +18,7 @@
</view>
</view>
<!-- 待收货 -->
<view class="tips-waitconfirm">
<view class="tips-waitconfirm" v-if="order_details.pick_self == 0">
<view class="lf-flex-column">
<view class="lf-font-28 lf-color-white">运输中</view>
<view class="lf-font-24 lf-color-white" v-if="true">广州转运中心公司 已发出，下一站南宁转运中心</view>
@ -64,7 +64,7 @@
</view>
</view>
</view>
<view style="margin-top: 60rpx;display: flex;justify-content: center;" v-if="$isRight(order_details) && order_details.status == 2">
<view style="margin-top: 60rpx;display: flex;justify-content: center;" v-if="$isRight(order_details) && order_details.status == 2 && order_details.pick_self != 0">
<view class="lf-flex-column">
<lf-qrcode :options="config.qrc"></lf-qrcode>
<view class="lf-font-28 lf-row-center" style="color: #15716E;">{{order_details.status_text}}</view>

20
pages/shop/goodsdetail.vue
View File

@ -177,7 +177,7 @@
<button class="btn" style="width: 349rpx;">立即秒杀</button>
</view>
<view v-else-if="type == 'point'">
<button class="btn" style="width: 349rpx;">立即兑换</button>
<button class="btn" style="width: 349rpx;" @click="goExchange()">立即兑换</button>
</view>
<view class="lf-flex" v-else>
<button class="btn1" @click="shoot(1)">加入购物车</button>
@ -319,6 +319,11 @@
this.getGoodsStock(); // 获取商品库存、规格信息
},
methods: {
goExchange() {
if(this.showSpec == '请选择规格') {
this.shoot(3)
}
},
// 切换商品收藏
switchCollect(){
if(!this.token){
@ -454,12 +459,6 @@
qty: this.goods_num
}
}
// 秒杀商品
if(this.$isRight(this.seckill)){
delete par.product_id;
par.seckill_goods_id = this.seckill.item_id;
par.seckill_item_id = this.seckill.id;
}
uni.showLoading({
title: '正在提交'
@ -485,7 +484,7 @@
// 直接结算
this.$cookieStorage.set('order_confirm', par);
uni.hideLoading();
this.$url('/pages/order/confirm/confirm');
this.$url('/pages/order/confirm/confirm?goods_type=1');
// this.$http.post({
// api: 'api/shopping/order/checkout',
// data: par,
@ -500,6 +499,11 @@
// }
// uni.hideLoading()
// }).catch(err => uni.hideLoading())
}else if(this.click_type == 3) {
// 直接结算
this.$cookieStorage.set('order_confirm', par);
uni.hideLoading();
this.$url('/pages/order/confirm/confirm?goods_type=0');
}
},
// 点击页面分享按钮

Write Preview
Loading…
Cancel
Save