修改

app.wxss

@@ -43,7 +43,12 @@ navigator {
     -webkit-line-clamp: 2;
 }
 
-.line-2 {
+.line-3 {
+    -webkit-line-clamp: 3;
+}
+
+.line-2,
+.line-3 {
     overflow: hidden;
     word-break: break-all;
     text-overflow: ellipsis;

packageA/activity/selectProduct/index.wxml

@@ -39,17 +39,17 @@
 	<view style="height: 100rpx;" />
 	<Yl_Empty wx:if="{{list.length==0}}" />
 </Yl_ListBox>
-<footer id='Footer' disabled='{{!result.length}}' bind:onClick='updateCart' />
+<footer wx:if="{{butText=='生成订单'}}" id='Footer' disabled='{{!result.length}}' bind:onClick='updateCart' />
 <!-- 底部 -->
-<!-- <view style="height: 130rpx;" />
-<view class="footer">
-	<view class="left">
-		已选{{result.length}}个
+<block wx:else>
+	<view style="height: 130rpx;" />
+	<view class="footer">
+		<view class="left">
+			已选{{result.length}}个
+		</view>
+		<van-button custom-class='but' disabled='{{!result.length}}' bind:click="submit">{{butText}}</van-button>
 	</view>
-	<van-button custom-class='but' disabled='{{!result.length}}' bind:click="submit">{{butText}}</van-button>
-</view> -->
-
-
+</block>
 
 <wxs module="decide">
 	module.exports = {

packageA/orderForm/modules/product/index.js

@@ -196,7 +196,8 @@ Component({
                                     "qty": v.qty, //数量
                                     "width": v.width || 0,
                                     "length": v.length || 0,
-                                    price: this.data.type == '工具订单' ? v.marketprice : v.contractprice
+                                    price: this.data.type == '工具订单' ? v.marketprice : v.contractprice,
+                                    sa_promotion_itemsid: v.sa_promotion_itemsid || 0
                                 }
                             })
                         }

pages/index/message/modules/list/index.js

@@ -7,6 +7,9 @@ Component({
       type: Function
     }
   },
+  options: {
+    addGlobalClass: true
+  },
   methods: {
     toDetail(e) {
       const {

pages/index/message/modules/list/index.wxml

@@ -1,6 +1,6 @@
 <navigator url="#" class='list' wx:for="{{list}}" wx:key="messageid" data-id="{{item.messageid}}" bindtap="toDetail">
 	<view class="title line-1">{{item.title}}</view>
-	<view class="content line-1">{{item.message}}</view>
+	<view class="content line-2">{{item.message}}</view>
 	<view class="time">
 		<van-tag class="tag" wx:if="{{item.objectname}}" plain type="primary">{{type.query(item.objectname)}}</van-tag>{{item.createdate}}
 	</view>