1 participants
-
Status changed to merged
-
mentioned in commit 04ac8a26dd77776f24a6c791ae40d2507be54899
-
Dev See merge request !468
Showing
3 changed files
pages/goods/goodsInfo/goodsInfo.js
| @@ -1549,6 +1549,8 @@ Page({ | @@ -1549,6 +1549,8 @@ Page({ | ||
| 1549 | //----------装载同一条形码的商品---------- | 1549 | //----------装载同一条形码的商品---------- |
| 1550 | async get_sku(stoid, sku, g_id, is_normal, func) { | 1550 | async get_sku(stoid, sku, g_id, is_normal, func) { |
| 1551 | var tt = this,arrdata=null; | 1551 | var tt = this,arrdata=null; |
| 1552 | + var now=ut.gettimestamp(); | ||
| 1553 | + | ||
| 1552 | await getApp().request.promiseGet("/api/weshop/goods/page", { | 1554 | await getApp().request.promiseGet("/api/weshop/goods/page", { |
| 1553 | data: { | 1555 | data: { |
| 1554 | store_id: o.stoid, | 1556 | store_id: o.stoid, |
pages/goods/goodsInfo/goodsInfo.wxml
| @@ -924,7 +924,7 @@ | @@ -924,7 +924,7 @@ | ||
| 924 | <view class="spec-goods"> | 924 | <view class="spec-goods"> |
| 925 | <image class="wh100 spec-img xc-distance-bottom" src="{{sele_g.original_img}}" binderror="pop_err_img" data-errorimg="sele_g.original_img"></image> | 925 | <image class="wh100 spec-img xc-distance-bottom" src="{{sele_g.original_img}}" binderror="pop_err_img" data-errorimg="sele_g.original_img"></image> |
| 926 | <view class="spec-goods-info"> | 926 | <view class="spec-goods-info"> |
| 927 | - <view class="spec-goods-name ellipsis-1">{{sele_g.goods_name}}</view> | 927 | + <view class="spec-goods-name ellipsis-2">{{sele_g.goods_name}}</view> |
| 928 | <view class="flex ai_end xc-val-money"> | 928 | <view class="flex ai_end xc-val-money"> |
| 929 | <view class="spec-goods-price" wx:if="{{prom_price==null}}" > | 929 | <view class="spec-goods-price" wx:if="{{prom_price==null}}" > |
| 930 | <text class="fs20">￥</text> | 930 | <text class="fs20">￥</text> |
pages/goods/goodsInfo/goodsInfo.wxss
| @@ -555,7 +555,7 @@ border-radius: 0 56rpx 55rpx 0; | @@ -555,7 +555,7 @@ border-radius: 0 56rpx 55rpx 0; | ||
| 555 | .spec-goods-name { | 555 | .spec-goods-name { |
| 556 | font-size: 30rpx; | 556 | font-size: 30rpx; |
| 557 | line-height: 35rpx; | 557 | line-height: 35rpx; |
| 558 | - height: 35rpx; | 558 | + height: 70rpx; |
| 559 | margin: 15rpx 20rpx 25rpx 0; | 559 | margin: 15rpx 20rpx 25rpx 0; |
| 560 | overflow: hidden; | 560 | overflow: hidden; |
| 561 | text-overflow: ellipsis;color: #333; | 561 | text-overflow: ellipsis;color: #333; |
| @@ -2454,7 +2454,7 @@ width: 20rpx; | @@ -2454,7 +2454,7 @@ width: 20rpx; | ||
| 2454 | height: 20rpx; | 2454 | height: 20rpx; |
| 2455 | } | 2455 | } |
| 2456 | .xc-val-money{ | 2456 | .xc-val-money{ |
| 2457 | - height:80rpx; | 2457 | + height:55rpx; |
| 2458 | } | 2458 | } |
| 2459 | 2459 | ||
| 2460 | .xc-distance-bottom{ | 2460 | .xc-distance-bottom{ |