wxd / MShopWeApp

Commit a1c4db9790f098a3112fe5770c92229aa47fc64a

Authored by 后端研发-苏明海
2 parents 83bd54d3 bdc09872

Merge branch 'test' into 'qa' 

Test

See merge request !607
Inline Side-by-side
Showing 5 changed files with 16 additions and 12 deletions
components/diy_seckill/diy_seckill.js
  View file @a1c4db9
... ... @@ -93,8 +93,8 @@ Component({
93 93 {isShowLoading:1,data:{store_id:os.stoid,is_end:0,is_show:1}}
94 94 ).then(res=>{
95 95 if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0) {
96   - goodsidlist=res.data.data.pageData;
97   - th.set_goods_list(null,goodslist);
  96 + var goodsidlist=res.data.data.pageData;
  97 + this.set_goods_list(null,goodsidlist);
98 98 }
99 99 });
100 100 },
... ...
packageA/pages/service_record/service_record.wxml
  View file @a1c4db9
... ... @@ -20,7 +20,7 @@
20 20 <view class="offline-container">
21 21 <view class="offline-list">
22 22 <view class="item" wx:for="{{list.pageData}}">
23   - <view class="subtitle">服务时间：{{item.EffectiveDay}}</view>
  23 + <view class="subtitle">服务时间：{{item.Billdate}}</view>
24 24 <view>
25 25 <view class="flex">
26 26 <view class="subitem">
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @a1c4db9
... ... @@ -3772,7 +3772,7 @@ Page({
3772 3772 context.setFontSize(16 * unit);
3773 3773 context.setLineJoin('round'); //交点设置成圆角
3774 3774 context.setFillStyle("white");
3775   - context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 76 * unit);
  3775 + context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 75 * unit);
3776 3776 }
3777 3777  
3778 3778  
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @a1c4db9
... ... @@ -1431,7 +1431,7 @@
1431 1431 <view class="poster">
1432 1432 <!-- <view class="poster" bindtap="previewImage"> -->
1433 1433 <image src="{{shareImgPath}}" class="poster-img" show-menu-by-longpress></image>
1434   - <view class="btn-close" catchtap="closePoster">x</view>
  1434 + <view class="btn-close" catchtap="closePoster"><text class="iconfont icon-close"></text></view>
1435 1435 </view>
1436 1436 <!-- <view class="btn-container">
1437 1437 <button class="btn-share" open-type="share" bindtap="">微信好友分享</button>
... ...
pages/goods/goodsInfo/goodsInfo.wxss
  View file @a1c4db9
... ... @@ -2664,7 +2664,7 @@ button.custom-service::after{
2664 2664 width: 100%;
2665 2665 height: 1055rpx;
2666 2666 border-radius: 20rpx;
2667   - /* box-shadow: 0 8px 12px #666; */
  2667 + box-shadow: 0 0 1px #000;
2668 2668 position: relative;
2669 2669 z-index: 999;
2670 2670 overflow: hidden;
... ... @@ -2689,18 +2689,22 @@ button.custom-service::after{
2689 2689 }
2690 2690 .btn-close {
2691 2691 background-color: rgba(0,0,0,.5);
2692   - color: white;
2693   - width: 40rpx;
2694   - height: 40rpx;
2695   - line-height: 40rpx;
  2692 + color: #ccc;
  2693 + width: 50rpx;
  2694 + height: 50rpx;
  2695 + line-height: 50rpx;
2696 2696 text-align: center;
2697 2697 border-radius: 50%;
2698 2698 position: absolute;
2699 2699 right: 20rpx;
2700   - top: 10rpx;
  2700 + top: 20rpx;
2701 2701 }
2702 2702  
2703 2703 .goods-price .rel_txt{
2704 2704 position: relative; top: 32rpx; font-size: 30rpx;
2705 2705 }
2706   -.goods-price .rel_img{width: 62rpx; height: 62rpx;position: relative; top: 12rpx;}
2707 2706 \ No newline at end of file
  2707 +.goods-price .rel_img{width: 62rpx; height: 62rpx;position: relative; top: 12rpx;}
  2708 +
  2709 +.icon-close {
  2710 + font-size: 48rpx;
  2711 +}
2708 2712 \ No newline at end of file
... ...