wxd / MShopWeApp

Commit d752bc2842203d51b79dda95fdd01afb6d6b06c7

Authored by 后端研发-苏明海
2 parents 3146dcfd df937faa

Merge branch 'qa' into 'master' 

Qa

See merge request !48
Inline Side-by-side
Showing 2 changed files with 13 additions and 7 deletions
pages/goods/goodsInfo/goodsInfo.js
  View file @d752bc2
... ... @@ -1074,7 +1074,13 @@ Page({
1074 1074  
1075 1075 //-----------选择属性的按钮事件----------
1076 1076 sele_spec: function(e) {
1077   - var gid = e.target.dataset.gid;
  1077 + var gid = e.currentTarget.dataset.gid;
  1078 + var sku_g=this.data.sku_g;
  1079 + var item=null;
  1080 + for(var i in sku_g){
  1081 + if(sku_g[i].goods_id==gid){item=sku_g[i]; break}
  1082 + }
  1083 + if(item) this.setData({sele_g:item,gid:gid});
1078 1084 },
1079 1085 //---------拿出门店分类和门店------------
1080 1086 async get_sto(e) {
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @d752bc2
... ... @@ -737,20 +737,20 @@
737 737 <block wx:if="{{prom_type==0}}">
738 738 <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
739 739 <view class="spec-goods-stock">可售：{{sele_g.store_count}}</view>
740   - <view class="spec-goods-stock">已选：{{sku_g[0].gg}}</view>
  740 + <view class="spec-goods-stock">已选：{{sele_g.gg}}</view>
741 741 </block>
742 742 <block wx:if="{{prom_type==1}}">
743 743 <view class="spec-goods-stock" wx:if="{{prom_st>0}}">已售：{{prom_act.buy_num+prom_act.virtual}}</view>
744 744 <view class="spec-goods-stock" wx:else >已售：{{prom_act.buy_num}}</view>
745 745 <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view>
746   - <view class="spec-goods-stock">已选：{{sku_g[0].gg}}</view>
  746 + <view class="spec-goods-stock">已选：{{sele_g.gg}}</view>
747 747 </block>
748 748 </view>
749 749 </view>
750 750 <!----商品的属性项目---->
751 751 <view hidden="{{ismend==1}}" class="spec-name">商品属性</view>
752 752 <view hidden="{{ismend==1}}" class="flex">
753   - <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='item.goods_id' wx:for="{{sku_g}}" wx:key="sku_g">
  753 + <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g">
754 754 {{item.gg}}
755 755 </view>
756 756 </view>
... ... @@ -824,7 +824,7 @@
824 824 <block wx:if="{{is_normal==0}}">
825 825 <view class="spec-goods-stock">已售：{{prom_act.buy_num}}</view>
826 826 <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view>
827   - <view class="spec-goods-stock">已选：{{sku_g[0].gg}}</view>
  827 + <view class="spec-goods-stock">已选：{{sele_g.gg}}</view>
828 828 </block>
829 829 <block wx:else>
830 830 <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
... ... @@ -838,14 +838,14 @@
838 838  
839 839 <block wx:if="{{is_normal==0}}">
840 840 <view hidden="{{ismend==1}}" class="flex">
841   - <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='item.goods_id' wx:for="{{sku_g}}" wx:key="sku_g">{{item.gg}}
  841 + <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g">{{item.gg}}
842 842 </view>
843 843 </view>
844 844 </block>
845 845  
846 846 <block wx:else>
847 847 <view hidden="{{ismend==1}}" class="flex">
848   - <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='item.goods_id' wx:for="{{sku_g}}" wx:key="sku_g">{{item.gg}}
  848 + <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g">{{item.gg}}
849 849 </view>
850 850 </view>
851 851 </block>
... ...