Merge branch 'master' of zj/kmall-pt into master

kmall-api/src/main/java/com/kmall/api/api/ApiGoodsController.java

@@ -556,6 +556,8 @@ public class ApiGoodsController extends ApiBaseAction {
     public Object count(@LoginUser UserVo loginUser) {
         Map<String, Object> resultObj = new HashMap();
         Map param = new HashMap();
+        param.put("storeId", getStoreId());
+        param.put("searchGoodsCount", '1');
         param.put("is_delete", 0);
         param.put("is_on_sale", 1);
         Integer goodsCount = goodsService.queryTotal(param);

kmall-api/src/main/resources/mybatis/mapper/ApiGoodsMapper.xml

@@ -313,6 +313,9 @@
         from mall_goods a
         left join mall_product_store_rela s on a.id = s.goods_id
         where 1 = 1 and a.is_on_sale = 1 AND s.stock_num > 0
+        <if test="storeId != null and storeId != ''">
+            and s.store_id = #{storeId}
+        </if>
         <if test="is_new != null and is_new != ''">
             and a.is_new = #{is_new}
         </if>
@@ -352,5 +355,8 @@
         <if test="goodsBizType != null and goodsBizType != ''">
             and a.goods_biz_type = #{goodsBizType}
         </if>
+        <if test="searchGoodsCount == '1'">
+            and a.goods_biz_type != '02' and a.goods_biz_type != '10'
+        </if>
     </select>
 </mapper>

wx-mall/pages/goods/goods.wxml

@@ -29,7 +29,7 @@
       </view>
       <view class="nav-item">
         <text class="nav-text">购物车</text>
-        <view class="nav-cell" bindtap="switchNav" data-name="cart">
+        <view class="nav-cell" bindtap="openCartPage" data-name="cart">
           <image src="../../static/images/nav-4.png"></image>
         </view>
       </view>

wx-mall/pages/shopping/address/address.js

@@ -78,6 +78,21 @@ Page({
       addressVo: selectAddressVo[0]
     })
 
+    util.request(api.AddressSave, {
+      id: selectAddressVo[0].id,
+      userName: selectAddressVo[0].userName,
+      telNumber: selectAddressVo[0].telNumber,
+      provinceName: selectAddressVo[0].provinceName,
+      cityName: selectAddressVo[0].cityName,
+      countyName: selectAddressVo[0].countyName,
+      detailInfo: selectAddressVo[0].detailInfo,
+      isDefault: true,
+      latitude: selectAddressVo[0].latitude,
+      longitude: selectAddressVo[0].longitude,
+    }, 'POST').then(function (res) {
+      
+    });
+
     wx.navigateBack();
   },
   getWtAddress() {

wx-mall/pages/ucenter/collect/collect.wxml

@@ -4,7 +4,7 @@
       <image class="img" src="{{item.list_pic_url}}"></image>
       <view class="info">
         <view class="name">{{item.name}}</view>
-        <view class="subtitle">{{item.goods_brief}}</view>
+        <view class="subtitle" wx:if="{{item.goods_brief}}">{{item.goods_brief}}</view>
         <view class="price">￥{{item.retail_price}}</view>
       </view>
     </view>