From f286d1fbeceed1cd6a2bb5370cd581e3eb9a89cc Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Mon, 4 Jun 2018 17:10:00 +0800
Subject: [PATCH] no message

---
 pages/activity_detail/activity_detail.js | 6 ------
 pages/create_order/create_order.js       | 4 +++-
 pages/create_order/create_order.wxml     | 2 +-
 pages/detail/detail.js                   | 4 +++-
 pages/detail/detail.wxml                 | 6 +++---
 pages/mall/mall.js                       | 1 -
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/pages/activity_detail/activity_detail.js b/pages/activity_detail/activity_detail.js
index 0c3e45b..7e4f0ec 100644
--- a/pages/activity_detail/activity_detail.js
+++ b/pages/activity_detail/activity_detail.js
@@ -43,12 +43,6 @@ Page({
     }, {
       name: '朋友圈',
       icon: '../../images/moments_ico.png'
-    }, {
-      name: '朋友圈',
-      icon: '../../images/moments_ico.png'
-    }, {
-      name: '朋友圈',
-      icon: '../../images/moments_ico.png'
     }],
     qrImageUrl: "",
   },
diff --git a/pages/create_order/create_order.js b/pages/create_order/create_order.js
index 4b306a2..3e46cf8 100644
--- a/pages/create_order/create_order.js
+++ b/pages/create_order/create_order.js
@@ -70,6 +70,7 @@ Page({
         goodsNo:str.goodsNo,
         sourceType: 0,
         goodsNum: 1,
+        goodsVersion: str.goodsVersion,
         couponNo: '',
         remark:that.data.remark
       },
@@ -78,7 +79,8 @@ Page({
         'sessionId': wx.getStorageSync('sessionId')
       },
       success: function (res) {
-        //--init data        
+        //--init data
+        console.log(res)        
         let data = res.data;
         let status = data.code;
         if (status != 0) {
diff --git a/pages/create_order/create_order.wxml b/pages/create_order/create_order.wxml
index 234723f..1e105bc 100644
--- a/pages/create_order/create_order.wxml
+++ b/pages/create_order/create_order.wxml
@@ -17,7 +17,7 @@
     </view>  -->
     <!-- <view class='icon icon-msg'>></view> -->
     <view class='msg'>
-      <view style='font-size:30rpx'>{{product.serviceAreaStr}}</view>
+      <view style='font-size:30rpx'>{{product.shortDesc}}</view>
     </view>
   </view>
   <!-- <view class='box'>
diff --git a/pages/detail/detail.js b/pages/detail/detail.js
index f304464..ac87b0e 100644
--- a/pages/detail/detail.js
+++ b/pages/detail/detail.js
@@ -46,6 +46,7 @@ Page({
         method: 'post',
         data: {
           goodsNo: that.data.product.goodsNo,
+          goodsVersion: that.data.product.goodsVersion,
           goodsNum: 1,
           couponNo: ''
         },
@@ -54,10 +55,11 @@ Page({
           'sessionId': wx.getStorageSync('sessionId')
         },
         success: function (res) {
-          //--init data        
+          //--init data 
           let data = res.data;
           let status = data.code;
           let str = JSON.stringify(data.response);
+          console.log(str)
           if (status != 0) {
             wx.showToast({
               title: data.msg,
diff --git a/pages/detail/detail.wxml b/pages/detail/detail.wxml
index 4facc55..68a4ba2 100644
--- a/pages/detail/detail.wxml
+++ b/pages/detail/detail.wxml
@@ -49,9 +49,9 @@
 	<view class="blank-50"></view>
     <view data-spm="action" class="item-action">
         <view class="buy-now {{nowDate > product.endedAt||product.soldNum >= product.totalNum?'gray':''}}" style="position: relative">
-            <view class='create-order' data-item='{{product}}' bindtap="{{nowDate > product.endedAt||product.soldNum >= product.totalNum?'':'createOrder'}}">立即下单</view>
-             <view class="buy-bg" style="{{nowDate > product.endedAt||product.soldNum >= product.totalNum?'display: block;':'display: none;'}}"> 
-             </view> 
+            <view class='create-order' data-item='{{product}}' bindtap="createOrder">立即下单</view>
+              <view class="buy-bg" style="{{nowDate > product.endedAt||product.soldNum >= product.totalNum?'display: block;':'display: none;'}}"> 
+             </view>  
         </view>
     </view>
 </view>
\ No newline at end of file
diff --git a/pages/mall/mall.js b/pages/mall/mall.js
index 5ef710c..7747ae5 100644
--- a/pages/mall/mall.js
+++ b/pages/mall/mall.js
@@ -57,7 +57,6 @@ Page({
   },
 
   loading: function (e) {
-    console.log("detail>>" + e.currentTarget.dataset.item.goodsNo);
     wx.navigateTo({
       url: '../detail/detail?goodsNo=' + e.currentTarget.dataset.item.goodsNo
     })