支付、订单数据分离

api/order.js

@@ -29,7 +29,7 @@ export function creatScanOrder(data) {
 // 获取订单最优优惠券
 export function calculate(data) {
 	return request({
-		url: '/zswl-cloud-shop/goodsInfo/calculate',
+		url: '/zswl-cloud-shop/goodsInfo/calculate2',
 		method:'post',
 		data
 	})

detail/goodsDetail/index.vue

@@ -19,7 +19,7 @@
 					<view class="discount-tag" v-if="info.marketPrice">
 						<!-- <image class="icon" src="@/static/down.png" mode=""></image> -->
 						<view class="discount-num">
-							{{((info.realPrice/info.marketPrice)*10).toFixed(1)}}折
+							{{(((info.platformPrice?info.platformPrice.price:info.realPrice)/info.marketPrice)*10).toFixed(1)}}折
 						</view>
 					</view>
 					<view class="old-price">

my/order/detail.vue

@@ -1014,7 +1014,7 @@
 							</view>
 							<view class="price-box">
 								<view class="price">
-									￥{{info.goodsList[0].goodsInfo.realPrice}}
+									￥{{info.goodsList[0].goodsInfo.platformPrice?info.goodsList[0].goodsInfo.platformPrice.price:info.goodsList[0].goodsInfo.realPrice}}
 								</view>
 							</view>
 						</template>

pay/pay.vue

@@ -159,6 +159,7 @@
 						couponId: this.info.couponId,
 						"goodsId": goodsId,
 						"shopId": shopId,
+						platform:'520100',
 						"userId": JSON.parse(uni.getStorageSync('userInfo')).userId
 					}).then(res => {
 						uni.hideLoading()
@@ -332,8 +333,7 @@
 					//TODO handle the exception
 				}
 				console.log('data', data);
-				// 移除优惠券计算价格
-				// that.calculate(that.info.goodsId, that.info.shopId)
+				that.calculate(that.info.goodsId, that.info.shopId)
 			})
 		}
 	}