Merge branch 'dev_7.2.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.2.0

src/shoppingGuid/page/pages/welfare/welfare.js

@@ -246,9 +246,9 @@ wxService.page({
       title: '加载中',
       mask: true
     })
-      wxService.post(
-        `/merchant/guideCollege/getPageInfoList?pageSize=${this.data.guidCollege.pageSize}&pageNum=${this.data.guidCollege.pageNum}`,
-        {
+    let pageSize = this.data.guidCollege.pageSize,
+      pageNum = this.data.guidCollege.pageNum;
+      wxService.post(`/merchant/guideCollege/getPageInfoListC?pageSize=${pageSize}&pageNum=${pageNum}`,{
           title : ''
         }
       ).then(res => {

src/shoppingGuid/page/pages/welfare/welfare.wxml

@@ -55,10 +55,10 @@
             </view> -->
           </view>
           <view class='rg-btn'>
-            <button class='theme-color' data-item="{{item}}" 
+            <button class='' data-item="{{item}}" 
             bindtap='onTapToRecommandProduct'>立即群发</button>
             <!-- style='background-color:#0091FF'  -->
-            <button class='theme-color' 
+            <button class='' 
             data-item="{{item}}" bindtap='onTapToShare'>定向发送</button>
           </view>
         </view>

src/shoppingGuid/page/pages/welfare/welfare.wxss

@@ -115,10 +115,17 @@ view{
 }
 
 .recommand-product .product-item .product-info .pro-main-title{
-  font-size: 28rpx;
+  font-size: 26rpx;
   color: #333333;
   font-weight: bold;
-  margin-bottom: 10rpx;
+  margin-bottom: 15rpx;
+  text-overflow: -o-ellipsis-lastline;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  line-clamp: 2;
+  -webkit-box-orient: vertical;
 }
 
 .pro-second-title{
@@ -155,11 +162,23 @@ view{
 }
 
 .price-btn .rg-btn button{
-  font-size: 24rpx;
-  height: 50rpx;
-  color: #ffffff;
+  font-size: 22rpx;
+  height: 45rpx;
+  color: #cb3c3c;
   display: flex;
   align-items: center;
+  padding: 0 10rpx;
+  border: solid 2rpx #cb3c3c;
+  background: #ffffff;
+  margin: 0;
+}
+
+.price-btn .rg-btn button:first-child{
+  margin-right: 15rpx;
+}
+
+.price-btn .rg-btn button::after{
+  border: none;
 }
 
 .price .normal{