From 99c10c4b363f4dba3425aa604392acfd209bdc55 Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Sun, 20 Dec 2020 17:26:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E4=B8=A4=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.txt                                 | 16 +++++++++++++
 .../static/admin/default/css/pluginsadmin.css |  2 +-
 sourcecode/alipay/default/app.acss            | 23 ++++++++++---------
 .../pages/goods-search/goods-search.axml      |  2 +-
 .../alipay/default/pages/index/index.axml     |  2 +-
 .../pages/lib/limitedtimediscount/home.axml   |  2 +-
 sourcecode/baidu/default/app.css              |  1 +
 .../pages/goods-search/goods-search.swan      |  2 +-
 .../baidu/default/pages/index/index.swan      |  2 +-
 .../pages/lib/limitedtimediscount/home.swan   |  2 +-
 sourcecode/qq/default/app.qss                 |  1 +
 .../pages/goods-search/goods-search.qml       |  2 +-
 sourcecode/qq/default/pages/index/index.qml   |  2 +-
 .../pages/lib/limitedtimediscount/home.qml    |  2 +-
 sourcecode/toutiao/default/app.ttss           |  1 +
 .../pages/goods-search/goods-search.ttml      |  2 +-
 .../toutiao/default/pages/index/index.ttml    |  2 +-
 .../pages/lib/limitedtimediscount/home.ttml   |  2 +-
 sourcecode/weixin/default/app.wxss            |  1 +
 .../pages/goods-search/goods-search.wxml      |  2 +-
 .../weixin/default/pages/index/index.wxml     |  2 +-
 .../pages/lib/limitedtimediscount/home.wxml   |  2 +-
 22 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 64b3446ee..68c6dead1 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,19 @@
++=========================================================+
+   ShopXO 1.9.3 Release --- http://shopxo.net
++=========================================================+
+全局
+	1. 新增签到插件
+
+web端
+
+
+
+小程序
+	1. 商品标题改成两行展示
+
+插件
+
+
 +=========================================================+
    ShopXO 1.9.2 Release 20201210 http://shopxo.net
 +=========================================================+
diff --git a/public/static/admin/default/css/pluginsadmin.css b/public/static/admin/default/css/pluginsadmin.css
index 17bb8bc51..c9585a855 100755
--- a/public/static/admin/default/css/pluginsadmin.css
+++ b/public/static/admin/default/css/pluginsadmin.css
@@ -73,7 +73,7 @@
     height: 28px;
     border-radius: 2px;
     font-size: 12px;
-    line-height: 28px;
+    line-height: 24px;
 }
 .content ul.am-gallery-bordered li .submit-state.am-default {
     background-color: #e6e6e6;
diff --git a/sourcecode/alipay/default/app.acss b/sourcecode/alipay/default/app.acss
index 0c7b084d0..e04299839 100644
--- a/sourcecode/alipay/default/app.acss
+++ b/sourcecode/alipay/default/app.acss
@@ -121,19 +121,20 @@ textarea {
 
 /* 文字超出部分使用省略号 */
 .single-text {
-    -o-text-overflow: ellipsis;
-	text-overflow: ellipsis;	  
-	overflow: hidden;
-	white-space: nowrap;
-    max-width: 100%;
+  -o-text-overflow: ellipsis;
+  text-overflow: ellipsis;	  
+  overflow: hidden;
+  white-space: nowrap;
+  max-width: 100%;
 }
 .multi-text {
-    max-width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  min-height: 104rpx;
 }
 
 
diff --git a/sourcecode/alipay/default/pages/goods-search/goods-search.axml b/sourcecode/alipay/default/pages/goods-search/goods-search.axml
index d7ac670e7..aad64f9cd 100755
--- a/sourcecode/alipay/default/pages/goods-search/goods-search.axml
+++ b/sourcecode/alipay/default/pages/goods-search/goods-search.axml
@@ -18,7 +18,7 @@
         <navigator url="/pages/goods-detail/goods-detail?goods_id={{item.id}}" hover-class="none">
           <image src="{{item.images}}" mode="aspectFit" />
           <view class="base">
-            <view class="single-text">{{item.title}}</view>
+            <view class="multi-text">{{item.title}}</view>
             <view class="price">
               <text class="sales-price">{{currency_symbol}}{{item.min_price}}</text>
             </view>
diff --git a/sourcecode/alipay/default/pages/index/index.axml b/sourcecode/alipay/default/pages/index/index.axml
index 2ac9bcc10..e04af3400 100644
--- a/sourcecode/alipay/default/pages/index/index.axml
+++ b/sourcecode/alipay/default/pages/index/index.axml
@@ -50,7 +50,7 @@
           <navigator url="/pages/goods-detail/goods-detail?goods_id={{goods.id}}" hover-class="none">
             <image src="{{goods.images}}" mode="aspectFit" />
             <view class="goods-base">
-              <view class="goods-title single-text">{{goods.title}}</view>
+              <view class="goods-title multi-text">{{goods.title}}</view>
               <view class="sales-price">{{currency_symbol}}{{goods.min_price}}</view>
             </view>
           </navigator>
diff --git a/sourcecode/alipay/default/pages/lib/limitedtimediscount/home.axml b/sourcecode/alipay/default/pages/lib/limitedtimediscount/home.axml
index bd4bcedec..5837ad5ce 100644
--- a/sourcecode/alipay/default/pages/lib/limitedtimediscount/home.axml
+++ b/sourcecode/alipay/default/pages/lib/limitedtimediscount/home.axml
@@ -20,7 +20,7 @@
           <navigator url="/pages/goods-detail/goods-detail?goods_id={{item.goods_id}}" hover-class="none">
             <image class="dis-block" src="{{item.images}}" mode="aspectFit"></image>
             <view class="goods-base">
-              <view class="goods-title single-text">{{item.title}}</view>
+              <view class="goods-title multi-text">{{item.title}}</view>
               <view class="goods-price single-text">{{currency_symbol}}{{item.price}}</view>
               <view a:if="{{(item.original_price || null) != null}}" class="goods-original-price single-text">{{currency_symbol}}{{item.original_price}}</view>
               <button size="mini">抢购</button>
diff --git a/sourcecode/baidu/default/app.css b/sourcecode/baidu/default/app.css
index 99360b475..43088538e 100755
--- a/sourcecode/baidu/default/app.css
+++ b/sourcecode/baidu/default/app.css
@@ -141,6 +141,7 @@ textarea {
   display: -webkit-box;
   -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
+  min-height: 104rpx;
 }
 
 
diff --git a/sourcecode/baidu/default/pages/goods-search/goods-search.swan b/sourcecode/baidu/default/pages/goods-search/goods-search.swan
index 2465dc0b9..86b4c7ff6 100755
--- a/sourcecode/baidu/default/pages/goods-search/goods-search.swan
+++ b/sourcecode/baidu/default/pages/goods-search/goods-search.swan
@@ -18,7 +18,7 @@
       <navigator url="/pages/goods-detail/goods-detail?goods_id={{item.id}}" hover-class="none">
         <image src="{{item.images}}" mode="aspectFit" />
         <view class="base">
-          <view class="single-text">{{item.title}}</view>
+          <view class="multi-text">{{item.title}}</view>
           <view class="price">
             <text class="sales-price">{{currency_symbol}}{{item.min_price}}</text>
           </view>
diff --git a/sourcecode/baidu/default/pages/index/index.swan b/sourcecode/baidu/default/pages/index/index.swan
index 3961fe4c7..2f15dbc06 100755
--- a/sourcecode/baidu/default/pages/index/index.swan
+++ b/sourcecode/baidu/default/pages/index/index.swan
@@ -50,7 +50,7 @@
           <navigator url="/pages/goods-detail/goods-detail?goods_id={{goods.id}}" hover-class="none">
             <image src="{{goods.images}}" mode="aspectFit" />
             <view class="goods-base">
-              <view class="goods-title single-text">{{goods.title}}</view>
+              <view class="goods-title multi-text">{{goods.title}}</view>
               <view class="sales-price">{{currency_symbol}}{{goods.min_price}}</view>
             </view>
           </navigator>
diff --git a/sourcecode/baidu/default/pages/lib/limitedtimediscount/home.swan b/sourcecode/baidu/default/pages/lib/limitedtimediscount/home.swan
index 685c23229..c6d2c0d0c 100644
--- a/sourcecode/baidu/default/pages/lib/limitedtimediscount/home.swan
+++ b/sourcecode/baidu/default/pages/lib/limitedtimediscount/home.swan
@@ -20,7 +20,7 @@
           <navigator url="/pages/goods-detail/goods-detail?goods_id={{item.goods_id}}" hover-class="none">
             <image class="dis-block" src="{{item.images}}" mode="aspectFit"></image>
             <view class="goods-base">
-              <view class="goods-title single-text">{{item.title}}</view>
+              <view class="goods-title multi-text">{{item.title}}</view>
               <view class="goods-price single-text">{{currency_symbol}}{{item.price}}</view>
               <view s-if="(item.original_price || null) != null" class="goods-original-price single-text">{{currency_symbol}}{{item.original_price}}</view>
               <button size="mini">抢购</button>
diff --git a/sourcecode/qq/default/app.qss b/sourcecode/qq/default/app.qss
index 0630d04c3..94b59b1f1 100755
--- a/sourcecode/qq/default/app.qss
+++ b/sourcecode/qq/default/app.qss
@@ -141,6 +141,7 @@ textarea {
   display: -webkit-box;
   -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
+  min-height: 104rpx;
 }
 
 
diff --git a/sourcecode/qq/default/pages/goods-search/goods-search.qml b/sourcecode/qq/default/pages/goods-search/goods-search.qml
index 8c7e30cc1..00e7efb9c 100755
--- a/sourcecode/qq/default/pages/goods-search/goods-search.qml
+++ b/sourcecode/qq/default/pages/goods-search/goods-search.qml
@@ -18,7 +18,7 @@
       <navigator url="/pages/goods-detail/goods-detail?goods_id={{item.id}}" hover-class="none">
         <image src="{{item.images}}" mode="aspectFit" />
         <view class="base">
-          <view class="single-text">{{item.title}}</view>
+          <view class="multi-text">{{item.title}}</view>
           <view class="price">
             <text class="sales-price">{{currency_symbol}}{{item.min_price}}</text>
           </view>
diff --git a/sourcecode/qq/default/pages/index/index.qml b/sourcecode/qq/default/pages/index/index.qml
index ab9c6d409..afb79dd5b 100755
--- a/sourcecode/qq/default/pages/index/index.qml
+++ b/sourcecode/qq/default/pages/index/index.qml
@@ -50,7 +50,7 @@
           <navigator url="/pages/goods-detail/goods-detail?goods_id={{goods.id}}" hover-class="none">
             <image src="{{goods.images}}" mode="aspectFit" />
             <view class="goods-base">
-              <view class="goods-title single-text">{{goods.title}}</view>
+              <view class="goods-title multi-text">{{goods.title}}</view>
               <view class="sales-price">{{currency_symbol}}{{goods.min_price}}</view>
             </view>
           </navigator>
diff --git a/sourcecode/qq/default/pages/lib/limitedtimediscount/home.qml b/sourcecode/qq/default/pages/lib/limitedtimediscount/home.qml
index b01af4276..d40c239a8 100644
--- a/sourcecode/qq/default/pages/lib/limitedtimediscount/home.qml
+++ b/sourcecode/qq/default/pages/lib/limitedtimediscount/home.qml
@@ -20,7 +20,7 @@
           <navigator url="/pages/goods-detail/goods-detail?goods_id={{item.goods_id}}" hover-class="none">
             <image class="dis-block" src="{{item.images}}" mode="aspectFit"></image>
             <view class="goods-base">
-              <view class="goods-title single-text">{{item.title}}</view>
+              <view class="goods-title multi-text">{{item.title}}</view>
               <view class="goods-price single-text">{{currency_symbol}}{{item.price}}</view>
               <view qq:if="{{(item.original_price || null) != null}}" class="goods-original-price single-text">{{currency_symbol}}{{item.original_price}}</view>
               <button size="mini">抢购</button>
diff --git a/sourcecode/toutiao/default/app.ttss b/sourcecode/toutiao/default/app.ttss
index 9a147323e..4ff436b8c 100755
--- a/sourcecode/toutiao/default/app.ttss
+++ b/sourcecode/toutiao/default/app.ttss
@@ -142,6 +142,7 @@ textarea {
   display: -webkit-box;
   -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
+  min-height: 104rpx;
 }
 
 
diff --git a/sourcecode/toutiao/default/pages/goods-search/goods-search.ttml b/sourcecode/toutiao/default/pages/goods-search/goods-search.ttml
index d9b23a027..26f72ddbf 100755
--- a/sourcecode/toutiao/default/pages/goods-search/goods-search.ttml
+++ b/sourcecode/toutiao/default/pages/goods-search/goods-search.ttml
@@ -18,7 +18,7 @@
       <navigator url="/pages/goods-detail/goods-detail?goods_id={{item.id}}" hover-class="none">
         <image src="{{item.images}}" mode="aspectFit" />
         <view class="base">
-          <view class="single-text">{{item.title}}</view>
+          <view class="multi-text">{{item.title}}</view>
           <view class="price">
             <text class="sales-price">{{currency_symbol}}{{item.min_price}}</text>
           </view>
diff --git a/sourcecode/toutiao/default/pages/index/index.ttml b/sourcecode/toutiao/default/pages/index/index.ttml
index c45256aff..b12138411 100755
--- a/sourcecode/toutiao/default/pages/index/index.ttml
+++ b/sourcecode/toutiao/default/pages/index/index.ttml
@@ -53,7 +53,7 @@
           <navigator url="/pages/goods-detail/goods-detail?goods_id={{goods.id}}" hover-class="none">
             <image src="{{goods.images}}" mode="aspectFit" />
             <view class="goods-base">
-              <view class="goods-title single-text">{{goods.title}}</view>
+              <view class="goods-title multi-text">{{goods.title}}</view>
               <view class="sales-price">{{currency_symbol}}{{goods.min_price}}</view>
             </view>
           </navigator>
diff --git a/sourcecode/toutiao/default/pages/lib/limitedtimediscount/home.ttml b/sourcecode/toutiao/default/pages/lib/limitedtimediscount/home.ttml
index de14bd23a..108a54451 100644
--- a/sourcecode/toutiao/default/pages/lib/limitedtimediscount/home.ttml
+++ b/sourcecode/toutiao/default/pages/lib/limitedtimediscount/home.ttml
@@ -20,7 +20,7 @@
           <navigator url="/pages/goods-detail/goods-detail?goods_id={{item.goods_id}}" hover-class="none">
             <image class="dis-block" src="{{item.images}}" mode="aspectFit"></image>
             <view class="goods-base">
-              <view class="goods-title single-text">{{item.title}}</view>
+              <view class="goods-title multi-text">{{item.title}}</view>
               <view class="goods-price single-text">{{currency_symbol}}{{item.price}}</view>
               <view tt:if="{{(item.original_price || null) != null}}" class="goods-original-price single-text">{{currency_symbol}}{{item.original_price}}</view>
               <button size="mini">抢购</button>
diff --git a/sourcecode/weixin/default/app.wxss b/sourcecode/weixin/default/app.wxss
index 0630d04c3..94b59b1f1 100755
--- a/sourcecode/weixin/default/app.wxss
+++ b/sourcecode/weixin/default/app.wxss
@@ -141,6 +141,7 @@ textarea {
   display: -webkit-box;
   -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
+  min-height: 104rpx;
 }
 
 
diff --git a/sourcecode/weixin/default/pages/goods-search/goods-search.wxml b/sourcecode/weixin/default/pages/goods-search/goods-search.wxml
index 4be0fdffd..9b9574a4e 100755
--- a/sourcecode/weixin/default/pages/goods-search/goods-search.wxml
+++ b/sourcecode/weixin/default/pages/goods-search/goods-search.wxml
@@ -18,7 +18,7 @@
       <navigator url="/pages/goods-detail/goods-detail?goods_id={{item.id}}" hover-class="none">
         <image src="{{item.images}}" mode="aspectFit" />
         <view class="base">
-          <view class="single-text">{{item.title}}</view>
+          <view class="multi-text">{{item.title}}</view>
           <view class="price">
             <text class="sales-price">{{currency_symbol}}{{item.min_price}}</text>
           </view>
diff --git a/sourcecode/weixin/default/pages/index/index.wxml b/sourcecode/weixin/default/pages/index/index.wxml
index ad8f1d69b..0b735e10c 100755
--- a/sourcecode/weixin/default/pages/index/index.wxml
+++ b/sourcecode/weixin/default/pages/index/index.wxml
@@ -50,7 +50,7 @@
           <navigator url="/pages/goods-detail/goods-detail?goods_id={{goods.id}}" hover-class="none">
             <image src="{{goods.images}}" mode="aspectFit" />
             <view class="goods-base">
-              <view class="goods-title single-text">{{goods.title}}</view>
+              <view class="goods-title multi-text">{{goods.title}}</view>
               <view class="sales-price">{{currency_symbol}}{{goods.min_price}}</view>
             </view>
           </navigator>
diff --git a/sourcecode/weixin/default/pages/lib/limitedtimediscount/home.wxml b/sourcecode/weixin/default/pages/lib/limitedtimediscount/home.wxml
index 0b4bef9b5..bcca79c3b 100644
--- a/sourcecode/weixin/default/pages/lib/limitedtimediscount/home.wxml
+++ b/sourcecode/weixin/default/pages/lib/limitedtimediscount/home.wxml
@@ -20,7 +20,7 @@
           <navigator url="/pages/goods-detail/goods-detail?goods_id={{item.goods_id}}" hover-class="none">
             <image class="dis-block" src="{{item.images}}" mode="aspectFit"></image>
             <view class="goods-base">
-              <view class="goods-title single-text">{{item.title}}</view>
+              <view class="goods-title multi-text">{{item.title}}</view>
               <view class="goods-price single-text">{{currency_symbol}}{{item.price}}</view>
               <view wx:if="{{(item.original_price || null) != null}}" class="goods-original-price single-text">{{currency_symbol}}{{item.original_price}}</view>
               <button size="mini">抢购</button>
-- 
GitLab