商品详情积分显示

pages/order/confirm/confirm.vue

@@ -184,6 +184,7 @@
 		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);

pages/order/newdetail/newdetail.vue

@@ -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>

pages/shop/goodsdetail.vue

@@ -321,7 +321,7 @@
 		methods: {
 			goExchange() {
 				if(this.showSpec == '请选择规格') {
-					this.shoot(2)
+					this.shoot(3)
 				}
 			},
 			// 切换商品收藏
@@ -459,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: '正在提交'
@@ -490,7 +484,7 @@
 					// 直接结算
 					this.$cookieStorage.set('order_confirm', par);
 					uni.hideLoading();
-					this.$url('/pages/order/confirm/confirm?goods_type=0');
+					this.$url('/pages/order/confirm/confirm?goods_type=1');
 					// this.$http.post({
 					// 	api: 'api/shopping/order/checkout',
 					// 	data: par,
@@ -505,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');
 				}
 			},
 			// 点击页面分享按钮