add: 下单页商品信息

src/pages/confirmOrder/confirmOrder.js

@@ -8,7 +8,9 @@ wxService.page({
   data: {
     addressInfo: '',
     showSelectCoupon: false,
-    skuIds: []
+    skuIds: [],
+    trolleySku2Buy: Array,
+    currentOrderList: Array
   },
 
   /**
@@ -22,34 +24,39 @@ wxService.page({
    */
   onShow: function () {
     let trolleySku2Buy = this.options.trolleySku2Buy
-    console.log('thtrolleySku2Bu', JSON.parse(trolleySku2Buy))
     // 下单 && 计算优惠价
-    if(trolleySku2Buy.length){
-      // this.getBill(trolleySku2Buy) // 下单
+    if (trolleySku2Buy.length) {
+      this.setData({ trolleySku2Buy }, () => {
         this.calPreferentialPrice(trolleySku2Buy)  // 计算优惠价
+      })
     }
   },
-  //  下单
-  getBill(trolleySku2Buy) {
+  // 计算优惠价
+  calPreferentialPrice(trolleySku2Buy) {
     wx.showLoading({
       title: '加载中'
     })
-    wxService.post(`/sale/trade/buyer/bill`,trolleySku2Buy).then(res => {
+    wxService.post(`/sale/trade/buyer/preview`, trolleySku2Buy).then(res => {
       if (res) {
         const { result, data } = res.data
         if (result == 0) {
           wx.hideLoading()
           console.log('data', data)
+          this.setData({ currentOrderList: data })
         }
       }
     })
   },
-  // 计算优惠价
-  calPreferentialPrice(trolleySku2Buy) {
+  handelGobuy() {
+    const { trolleySku2Buy } = this.data
+    this.getBill(trolleySku2Buy) // 下单
+  },
+  //  下单
+  getBill(trolleySku2Buy) {
     wx.showLoading({
       title: '加载中'
     })
-    wxService.post(`/sale/trade/buyer/preview`,trolleySku2Buy).then(res => {
+    wxService.post(`/sale/trade/buyer/bill`, trolleySku2Buy).then(res => {
       if (res) {
         const { result, data } = res.data
         if (result == 0) {

src/pages/confirmOrder/confirmOrder.wxml

@@ -3,19 +3,23 @@
 	<view class="address-wrap">
 		<block wx:if="{{false}}">
 			<view class="address-section">
-        <input class="address-input" placeholder="请输入收货人姓名"></input>
-        <input class="address-input" placeholder="请输入手机号码"></input>
+				<input class="address-input" placeholder="请输入收货人姓名" />
+				<input class="address-input" placeholder="请输入手机号码" />
 			</view>
 			<view class="address-section">
 				<!-- <view class="">所在区域</view> -->
-        <picker class="address-input address-picker" mode="region" bindchange="bindRegionChange" value="{{region}}" custom-item="{{customItem}}">
-          <view class="picker-choose">
-            
-          </view>
+				<picker
+				 class="address-input address-picker"
+				 mode="region"
+				 bindchange="bindRegionChange"
+				 value="{{region}}"
+				 custom-item="{{customItem}}"
+				>
+					<view class="picker-choose" />
 				</picker>
 			</view>
 			<view class="address-section">
-        <input class="address-input address-detail" placeholder="请输入路名门牌号"></input>
+				<input class="address-input address-detail" placeholder="请输入路名门牌号" />
 			</view>
 		</block>
 		<block>
@@ -29,7 +33,7 @@
 						{{addressInfo.provinceName}} {{addressInfo.cityName}} {{addressInfo.countyName}} {{addressInfo.detailInfo}}
 					</view>
 					<view class="arrow-right-wrap">
-            <image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png"></image>
+						<image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png" />
 					</view>
 				</view>
 			</view>
@@ -39,61 +43,48 @@
 		</view>
 	</view>
 	<view class="address-line">
-    <image src="/assets/imgs/7_1_0/address-line.png"></image>
+		<image src="/assets/imgs/7_1_0/address-line.png" />
 	</view>
 	<!-- 分割线 -->
-  <view class="gray-line"></view>
+	<view class="gray-line" />
 	<!-- 商品列表 -->
 	<view class="pro-wrap">
+		<block wx:for="{{currentOrderList}}" wx:key="{{item}}">
 			<view class="pro-list">
-        <image class="pro-img" src="/assets/imgs/7_1_0/address-line.png"></image>
-        <view class="pro-info">
-          <view class="pro-name">商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名</view>
-          <view class="pro-desc">
-            规格
-          </view>
-          <view class="pro-price">
-            <text class="price">￥258</text>
-            <text class="number">x 1</text>
-          </view>
-        </view>
-      </view>
-
-      <view class="pro-list">
-        <image class="pro-img" src="/assets/imgs/7_1_0/address-line.png"></image>
+				<image class="pro-img" src="{{item.productImgUrl}}" />
 				<view class="pro-info">
-          <view class="pro-name">商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名</view>
+					<view class="pro-name">{{item.productName}}</view>
 					<view class="pro-desc">
-            规格
+						规格 {{item.skuSpec}}
 					</view>
 					<view class="pro-price">
-            <text class="price">￥258</text>
-            <text class="number">x 1</text>
+						<text class="price">￥{{item.price}}</text>
+						<text class="number">x {{item.count}}</text>
 					</view>
 				</view>
 			</view>
+		</block>
 	</view>
 	<!-- 分割线 -->
-  <view class="gray-line"></view>
-
+	<view class="gray-line" />
 
 	<!-- 商品合计 -->
 	<view class="pro-sum">
 		<view class="plus-wrap">
 			<view class="plus-top-text">
-        <image src="/assets/imgs/7_1_0/plus-icon.png"></image>
+				<image src="/assets/imgs/7_1_0/plus-icon.png" />
 				<text>现在勾选</text>
 			</view>
 			<view class="plus-bottom-text">
 				<text>vip可尊享N大权益</text>
-        <image src="/assets/imgs/7_1_0/explain.png"></image>
+				<image src="/assets/imgs/7_1_0/explain.png" />
 			</view>
 			<view class="select-desc {{isSelect ? 'select-tip' : 'unselect-tip'}}">
 				<!-- <image src="{{isSelect ? '/assets/imgs/7_1_0/selected.png' : '/assets/imgs/7_1_0/unselect.png'}}" class="{{isSelect ? 'select-tip' : 'unselect-tip'}}"></image> -->
 				<text>{{isSelect ? '已勾选，即享优惠' : '勾选开通'}}</text>
 			</view>
 			<view class="select-type {{isSelect ? 'theme-color' : ''}}">
-          <image src="{{isSelect ? '/assets/imgs/7_1_0/tick-success.png' : '/assets/imgs/7_1_0/tick.png'}}"></image>
+				<image src="{{isSelect ? '/assets/imgs/7_1_0/tick-success.png' : '/assets/imgs/7_1_0/tick.png'}}" />
 			</view>
 		</view>
 		<view class="order-sum">
@@ -115,7 +106,7 @@
 					<text class="price-label">优惠券</text>
 					<view class="select-coupon" bindtap="selectCoupon">
 						<text class="{{haveCoupon ? 'coupon-price' : 'no-coupon'}}">{{haveCoupon ? '-￥100' : '无可用优惠券'}}</text>
-            <image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png"></image>
+						<image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png" />
 					</view>
 				</view>
 			</view>
@@ -125,7 +116,7 @@
 					<text class="vip-desc"> （不可使用任何优惠或积分）</text>
 					<view class="select-coupon">
 						<text class="coupon-price">+￥100</text>
-            <image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png"></image>
+						<image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png" />
 					</view>
 				</view>
 			</view>
@@ -141,10 +132,9 @@
 			<text class="cost-label">实付款：</text>
 			<text class="cost-price">￥306</text>
 		</view>
-    <view class="theme-color buy-btn">立即购买</view>
+		<view class="theme-color buy-btn" bindtap="handelGobuy">立即购买</view>
 	</view>
 </view>
 
-<select-coupon
- show="{{showSelectCoupon}}"
-/>
+<select-coupon show="{{showSelectCoupon}}" />
+
\ No newline at end of file

src/project.config.json

@@ -39,7 +39,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 23,
+			"current": 17,
 			"list": [
 				{
 					"id": -1,
@@ -147,10 +147,10 @@
 					"scene": null
 				},
 				{
-					"id": -1,
+					"id": 17,
 					"name": "确认订单",
 					"pathName": "pages/confirmOrder/confirmOrder",
-					"query": "",
+					"query": "trolleySku2Buy=[{\"count\":3,\"skuId\":1556108807316001},{\"count\":1,\"skuId\":1556108807316000}]",
 					"scene": null
 				},
 				{