nyx dev:

SHA-1: 6a3e30e5

* nyx weapp: bug fix
1. 提交订单，只提交index==0的那张商品图片
2. 价格保证为float
3. 添加多行溢出效果

增值产品-小程序及app/nyx-dev/pages/activity/activity-info/activity-info.js

-// pages/activity/activity-info/activity-info.js
+// pages/activity/activity-info/activity-info.js
@@ -335,7 +335,7 @@ Page({
     var url = "/pages/mall/order/order?"
     var url = "/pages/mall/order/order?"
       + "&activity_id=" + _this.__data__.activityInfo["activity_id"]
       + "&activity_id=" + _this.__data__.activityInfo["activity_id"]
       + "&products_string=" + products_string
       + "&products_string=" + products_string
-      + "&product_image=" + _this.__data__.activityInfo['note_image']
+      + "&product_image=" + _this.__data__.activityInfo['note_image'][0]
       + "&member_name=" + _this.__data__.activityInfo['member_name']
       + "&member_name=" + _this.__data__.activityInfo['member_name']
       + "&title=" + _this.__data__.activityInfo['title']      
       + "&title=" + _this.__data__.activityInfo['title']      
       + "&curIndex=" + _this.data.curIndex
       + "&curIndex=" + _this.data.curIndex

增值产品-小程序及app/nyx-dev/pages/activity/activity.wxml

-<wxs module="tutil" src="./../../utils/date.wxs"></wxs>
+<wxs module="tutil" src="./../../utils/date.wxs"></wxs>
@@ -102,7 +102,7 @@
             <view class="note-column">
             <view class="note-column">
               <navigator url='{{item.url}}&num_like={{item.num_like}}' >
               <navigator url='{{item.url}}&num_like={{item.num_like}}' >
               <!-- 商家信息 -->
               <!-- 商家信息 -->
-              {{item.title}}
+              <text>{{item.title}}</text>
               <!-- 商品价格 -->
               <!-- 商品价格 -->
               <span>
               <span>
                 <view class="price-row">
                 <view class="price-row">

增值产品-小程序及app/nyx-dev/pages/activity/activity.wxss

-/*
+/*
@@ -335,6 +335,16 @@
   width: 55%;
   width: 55%;
 }
 }
 
 
+.note-column text{
+  /* 多行溢出省略 */
+  display: -webkit-box;    
+  word-break: break-all;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp:2;
+  overflow: hidden;
+  text-overflow:ellipsis;
+}
+
 .writer-image{
 .writer-image{
   width: 240rpx;
   width: 240rpx;
   height: 240rpx;
   height: 240rpx;

增值产品-小程序及app/nyx-dev/pages/mall/order/order.js

-// pages/my/my-orders/my-orders.js
+// pages/my/my-orders/my-orders.js
@@ -73,7 +73,7 @@ Page({
           orderItems[i]['quantity'] = 1
           orderItems[i]['quantity'] = 1
           orderItems[i]['defaultStatus'] = 1
           orderItems[i]['defaultStatus'] = 1
           totalPrice = orderItems[i]['unitPrice']
           totalPrice = orderItems[i]['unitPrice']
-          totalPrice = totalPrice.toFixed(2)
+          totalPrice = parseFloat(totalPrice).toFixed(2)
         }
         }
         else
         else
         {
         {

增值产品-小程序及app/nyx-dev/pages/my/my-orders/my-orders.wxml

-<view class="page"> 
+<view class="page"> 
@@ -33,7 +33,7 @@
           <view class="note-row">
           <view class="note-row">
               <image class="writer-image" src="{{item.product_image}}"/>
               <image class="writer-image" src="{{item.product_image}}"/>
               <view class="note-column">
               <view class="note-column">
-                <span>{{item.title}}·{{sub_item.product_desc}}</span>
+                <span><text>{{item.title}}·{{sub_item.product_desc}}</text></span>
                 <span>
                 <span>
                   <view class="price-row">
                   <view class="price-row">
                     <view class="sub-price">￥{{sub_item.unit_price}}</view>
                     <view class="sub-price">￥{{sub_item.unit_price}}</view>

增值产品-小程序及app/nyx-dev/pages/my/my-orders/my-orders.wxss

-.page{
+.page{
@@ -309,6 +309,16 @@
     width: 540rpx;
     width: 540rpx;
   }
   }
 
 
+  .note-column text{
+    /* 多行溢出省略 */
+    display: -webkit-box;    
+    word-break: break-all;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp:2;
+    overflow: hidden;
+    text-overflow:ellipsis;
+  }
+
   .writer-image{
   .writer-image{
     width: 120rpx;
     width: 120rpx;
     height: 120rpx;
     height: 120rpx;