From 1ac635b7f3f55d7954a3a726733352fe7da82169 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Tue, 14 Apr 2020 16:01:20 +0800
Subject: [PATCH] groupSummary

---
 app.js                            | 5 +++--
 pages/mall/order-info/index.wxml  | 9 ++++++++-
 pages/mall/order-offer/index.js   | 6 ++----
 pages/mall/order-offer/index.wxml | 4 ++--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app.js b/app.js
index 76d0440..1f9f10d 100644
--- a/app.js
+++ b/app.js
@@ -1,7 +1,7 @@
  //app.js
  App({
    //----------------------------------------------globalData--------------------------------------
-   release: 1,
+   release: 0,
    httpUrl: 'https://api-test.qniao.cn',
    tmplIds: ['kg0T1ve0FpYrEtZ4ExbypHm8mtS7OJaehvqN_T9ypoI'],
    globalData: {
@@ -15,7 +15,8 @@
      if (this.release) {
        this.httpUrl = 'https://api.qniao.cn'
      } else {
-       this.httpUrl = 'http://api-test.qniao.cn'
+      //  this.httpUrl = 'http://192.168.0.24:9000'
+       this.httpUrl = 'https://api-test.qniao.cn'
      }
      wx.getSystemInfo({
        success: e => {
diff --git a/pages/mall/order-info/index.wxml b/pages/mall/order-info/index.wxml
index 4125a66..59db986 100644
--- a/pages/mall/order-info/index.wxml
+++ b/pages/mall/order-info/index.wxml
@@ -39,7 +39,7 @@
 		<view class="text-gray" style="font-size:28rpx">购买数量</view>
 		<wux-input-number value="{{form.number}}" controlled="{{true}}" disabled="{{false}}" color="stable" min="{{1}}" max="{{form.stockNumber||orderInfo.stockNumber}}" bind:change="onNumChange" />
 	</view>
-
+	
 	<view class="bg-white" style="padding:32rpx;margin-top:32rpx">
 		<view class="text-black" style="font-size:32rpx">商品描述</view>
 		<view class="text-gray" style="font-size:28rpx;margin-top:32rpx">{{orderInfo.detail}}</view>
@@ -47,6 +47,13 @@
 	<view class="bg-white">
 		<view style="height:1px;width:100%;background-color:#F3F3F3;margin-left:32rpx"></view>
 	</view>
+	<view class="bg-white" style="padding:32rpx;margin-top:32rpx" wx:if="{{orderInfo.groupSummary}}">
+		<view class="text-black" style="font-size:32rpx">拼团说明</view>
+		<view class="text-gray" style="font-size:28rpx;margin-top:32rpx">{{orderInfo.groupSummary}}</view>
+	</view>
+	<view class="bg-white" wx:if="{{orderInfo.groupSummary}}">
+		<view style="height:1px;width:100%;background-color:#F3F3F3;margin-left:32rpx"></view>
+	</view>
 	<view class="bg-white" style="padding:32rpx;">
 		<view class="text-black" style="font-size:32rpx">送货说明</view>
 		<view class="text-gray" style="font-size:28rpx;margin-top:32rpx">{{orderInfo.deliverTips}}</view>
diff --git a/pages/mall/order-offer/index.js b/pages/mall/order-offer/index.js
index b908ac8..3f7efb2 100644
--- a/pages/mall/order-offer/index.js
+++ b/pages/mall/order-offer/index.js
@@ -9,9 +9,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    form: {
-      payType: 2,
-    },
+    form: {},
     addressInfo: null,
     isIPhoneX: false
   },
@@ -21,7 +19,7 @@ Page({
   onLoad: function (options) {
     if (options.json) {
       var form = JSON.parse(options.json)
-      form.payType = 2
+      form.payType = 1
       // form.totalPrice = float.accAdd(float.accMul(form.unitPrice, form.number), form.dividePrice)
       form.totalPrice = float.accMul(form.unitPrice, form.number).toFixed(2)
       form.preAmount = float.accMul(float.accMul(form.unitPrice, form.number), 0.1).toFixed(2)
diff --git a/pages/mall/order-offer/index.wxml b/pages/mall/order-offer/index.wxml
index a302b3c..ba22562 100644
--- a/pages/mall/order-offer/index.wxml
+++ b/pages/mall/order-offer/index.wxml
@@ -66,13 +66,13 @@
 			<text class="cuIcon-titles text-blue"></text>
 			<view style="color:black;font-size:32rpx">付款方式</view>
 		</view>
-		<!-- <view class="flex flex-justify" style="height:80rpx" data-index="1" bindtap="checkMode">
+		<view class="flex flex-justify" style="height:80rpx" data-index="1" bindtap="checkMode">
 			<view class="flex align-end">
 				<text style="font-size:28rpx">预付定金</text>
 				<text class="offer-hint" style="margin-left:10rpx">预付款10%，余款货到付款</text>
 			</view>
 			<text class="cuIcon-{{form.payType==1?'roundcheckfill':'roundcheck'}} text-{{form.payType==1?'blue':'grey'}}" style="font-size:36rpx"></text>
-		</view> -->
+		</view>
 		<view class="flex flex-justify" style="height:80rpx" data-index="2" bindtap="checkMode">
 			<view style="font-size:28rpx">货到付款</view>
 			<text class="cuIcon-{{form.payType==2?'roundcheckfill':'roundcheck'}} text-{{form.payType==2?'blue':'grey'}}" style="font-size:36rpx"></text>