diff --git a/changelog.txt b/changelog.txt index 64b3446eedbea76398d4a73d75b2dbd4285de555..68c6dead1baf29b9c255e7bde20058668f4fbcc3 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 17bb8bc51960eaa0f51a321ddd1ef1deec29e6e4..c9585a8552d2f55bdd80cf66480d07ac10cb91d0 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 0c7b084d07381afb948ba2ccb440f6fb025d0a2a..e042998391c4aa6ff3527d3920b5917135fd4818 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 d7ac670e7ef44069308a428643520e01dbcb4320..aad64f9cd5e0666476e92d93d044a2fffbdd0871 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 @@ - {{item.title}} + {{item.title}} {{currency_symbol}}{{item.min_price}} diff --git a/sourcecode/alipay/default/pages/index/index.axml b/sourcecode/alipay/default/pages/index/index.axml index 2ac9bcc101c075246fc4b37f8ddc4edbea5f3c6b..e04af34001cdc8a79b73fd7053732a6e23a00c5b 100644 --- a/sourcecode/alipay/default/pages/index/index.axml +++ b/sourcecode/alipay/default/pages/index/index.axml @@ -50,7 +50,7 @@ - {{goods.title}} + {{goods.title}} {{currency_symbol}}{{goods.min_price}} diff --git a/sourcecode/alipay/default/pages/lib/limitedtimediscount/home.axml b/sourcecode/alipay/default/pages/lib/limitedtimediscount/home.axml index bd4bcedec5ef62467f4a142c285ec1cd08028f2a..5837ad5ceea361d27d7b7829de3158d1cd32475d 100644 --- a/sourcecode/alipay/default/pages/lib/limitedtimediscount/home.axml +++ b/sourcecode/alipay/default/pages/lib/limitedtimediscount/home.axml @@ -20,7 +20,7 @@ - {{item.title}} + {{item.title}} {{currency_symbol}}{{item.price}} {{currency_symbol}}{{item.original_price}} diff --git a/sourcecode/baidu/default/app.css b/sourcecode/baidu/default/app.css index 99360b47530d439e12e58be3fc1aafe8b98977e1..43088538e91eae28d298e3af1f5776651f79f86c 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 2465dc0b9b938a93973d454ec5a15d3973dad8ab..86b4c7ff630de33e119957d9447ea1f3903b8c09 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 @@ - {{item.title}} + {{item.title}} {{currency_symbol}}{{item.min_price}} diff --git a/sourcecode/baidu/default/pages/index/index.swan b/sourcecode/baidu/default/pages/index/index.swan index 3961fe4c75881b33e7ee5692075d0307eae6b4b3..2f15dbc06af0fc2321e638dbf039c6bc7220be69 100755 --- a/sourcecode/baidu/default/pages/index/index.swan +++ b/sourcecode/baidu/default/pages/index/index.swan @@ -50,7 +50,7 @@ - {{goods.title}} + {{goods.title}} {{currency_symbol}}{{goods.min_price}} diff --git a/sourcecode/baidu/default/pages/lib/limitedtimediscount/home.swan b/sourcecode/baidu/default/pages/lib/limitedtimediscount/home.swan index 685c23229772d59bc6aff88c57b179439d5cb0ac..c6d2c0d0c9b6425774f48f8a93c96f050004ee8c 100644 --- a/sourcecode/baidu/default/pages/lib/limitedtimediscount/home.swan +++ b/sourcecode/baidu/default/pages/lib/limitedtimediscount/home.swan @@ -20,7 +20,7 @@ - {{item.title}} + {{item.title}} {{currency_symbol}}{{item.price}} {{currency_symbol}}{{item.original_price}} diff --git a/sourcecode/qq/default/app.qss b/sourcecode/qq/default/app.qss index 0630d04c3ea3e133fe6eb7d4553aa129b50de132..94b59b1f1c106cbfeffd43bfb25235b2901d4802 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 8c7e30cc1dc968f4102e401bc6859daa8e05117b..00e7efb9cc76c231c62bb4321ee0817e5542404a 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 @@ - {{item.title}} + {{item.title}} {{currency_symbol}}{{item.min_price}} diff --git a/sourcecode/qq/default/pages/index/index.qml b/sourcecode/qq/default/pages/index/index.qml index ab9c6d40906c9ac2b42ea5a0f817a82629ced607..afb79dd5bd77883b6ebdc02d2493a972ea576a31 100755 --- a/sourcecode/qq/default/pages/index/index.qml +++ b/sourcecode/qq/default/pages/index/index.qml @@ -50,7 +50,7 @@ - {{goods.title}} + {{goods.title}} {{currency_symbol}}{{goods.min_price}} diff --git a/sourcecode/qq/default/pages/lib/limitedtimediscount/home.qml b/sourcecode/qq/default/pages/lib/limitedtimediscount/home.qml index b01af4276e77cb63431dd0c841b26a289b4cc9e2..d40c239a8e7229f0aea617e290d52e82544ca8b8 100644 --- a/sourcecode/qq/default/pages/lib/limitedtimediscount/home.qml +++ b/sourcecode/qq/default/pages/lib/limitedtimediscount/home.qml @@ -20,7 +20,7 @@ - {{item.title}} + {{item.title}} {{currency_symbol}}{{item.price}} {{currency_symbol}}{{item.original_price}} diff --git a/sourcecode/toutiao/default/app.ttss b/sourcecode/toutiao/default/app.ttss index 9a147323e1142acdf7d0dd731fa674f6b29e2747..4ff436b8c85a59f8d6d5561c6a0a1350cec85ab3 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 d9b23a027de9e1806bf06d0e902fef8297043bab..26f72ddbf5e2c7678166e812bb6d51a7353e7d81 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 @@ - {{item.title}} + {{item.title}} {{currency_symbol}}{{item.min_price}} diff --git a/sourcecode/toutiao/default/pages/index/index.ttml b/sourcecode/toutiao/default/pages/index/index.ttml index c45256aff7d4b07e529a43e069bc9c5f8b82c749..b12138411fd103644d14e85b678bd7eaabfc050c 100755 --- a/sourcecode/toutiao/default/pages/index/index.ttml +++ b/sourcecode/toutiao/default/pages/index/index.ttml @@ -53,7 +53,7 @@ - {{goods.title}} + {{goods.title}} {{currency_symbol}}{{goods.min_price}} diff --git a/sourcecode/toutiao/default/pages/lib/limitedtimediscount/home.ttml b/sourcecode/toutiao/default/pages/lib/limitedtimediscount/home.ttml index de14bd23afbe131d14b25184c47333fbe35c93e0..108a54451039844c7127bb85adee50eb7d9f6343 100644 --- a/sourcecode/toutiao/default/pages/lib/limitedtimediscount/home.ttml +++ b/sourcecode/toutiao/default/pages/lib/limitedtimediscount/home.ttml @@ -20,7 +20,7 @@ - {{item.title}} + {{item.title}} {{currency_symbol}}{{item.price}} {{currency_symbol}}{{item.original_price}} diff --git a/sourcecode/weixin/default/app.wxss b/sourcecode/weixin/default/app.wxss index 0630d04c3ea3e133fe6eb7d4553aa129b50de132..94b59b1f1c106cbfeffd43bfb25235b2901d4802 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 4be0fdffdc9b54f5df20c499252cc116c24318ed..9b9574a4e4c156d1621f84fb440b25bc6d1fe994 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 @@ - {{item.title}} + {{item.title}} {{currency_symbol}}{{item.min_price}} diff --git a/sourcecode/weixin/default/pages/index/index.wxml b/sourcecode/weixin/default/pages/index/index.wxml index ad8f1d69bed28b2b9de4bf74c9c56fac9cf38ae3..0b735e10c46d4141c1cd837ada20b8f1ec7fb98d 100755 --- a/sourcecode/weixin/default/pages/index/index.wxml +++ b/sourcecode/weixin/default/pages/index/index.wxml @@ -50,7 +50,7 @@ - {{goods.title}} + {{goods.title}} {{currency_symbol}}{{goods.min_price}} diff --git a/sourcecode/weixin/default/pages/lib/limitedtimediscount/home.wxml b/sourcecode/weixin/default/pages/lib/limitedtimediscount/home.wxml index 0b4bef9b558121cd9f0d147a91b8959c0826f60e..bcca79c3b5c142ba60d2a98003e3b31865d5e610 100644 --- a/sourcecode/weixin/default/pages/lib/limitedtimediscount/home.wxml +++ b/sourcecode/weixin/default/pages/lib/limitedtimediscount/home.wxml @@ -20,7 +20,7 @@ - {{item.title}} + {{item.title}} {{currency_symbol}}{{item.price}} {{currency_symbol}}{{item.original_price}}