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

kmall-admin/src/main/java/com/kmall/admin/entity/ThirdMerchantBizEntity.java

@@ -59,6 +59,16 @@ public class ThirdMerchantBizEntity implements Serializable {
      */
     private Date tstm;
 
+    private String isMapShow;
+
+    public String getIsMapShow() {
+        return isMapShow;
+    }
+
+    public void setIsMapShow(String isMapShow) {
+        this.isMapShow = isMapShow;
+    }
+
     public String getIsStoreUserShare() {
         return isStoreUserShare;
     }

kmall-admin/src/main/resources/logback.xml

@@ -6,7 +6,7 @@ debug：当此属性设置为true时，将打印出logback内部日志信息，
 -->
 <configuration scan="false" scanPeriod="60 seconds" debug="false">
 
-    <property name="LOG_HOME" value="/data/logs/kmall-pt/kmall-admin/"/>
+    <property name="LOG_HOME" value="/data/project/logs/kmall-pt/kmall-admin/"/>
     <!-- 定义日志的根目录 -->
     <property name="TRACE_DIR" value="trace" />
     <property name="DEBUG_DIR" value="debug" />

kmall-admin/src/main/resources/mybatis/mapper/ThirdMerchantBizDao.xml

@@ -16,6 +16,7 @@
         <result property="moderSn" column="moder_sn"/>
         <result property="modTime" column="mod_time"/>
         <result property="tstm" column="tstm"/>
+		<result property="isMapShow" column="is_map_show"/>
     </resultMap>
 
 	<select id="queryObject" resultType="com.kmall.admin.entity.ThirdMerchantBizEntity">
@@ -31,7 +32,8 @@
 			`create_time`,
 			`moder_sn`,
 			`mod_time`,
-			`tstm`
+			`tstm`,
+			is_map_show
 		from third_merchant_biz
 		where third_merch_sn = #{id}
 	</select>
@@ -49,7 +51,8 @@
 		`create_time`,
 		`moder_sn`,
 		`mod_time`,
-		`tstm`
+		`tstm`,
+		is_map_show
 		from third_merchant_biz
 		where merch_sn = #{value}
 	</select>
@@ -67,7 +70,8 @@
 		`create_time`,
 		`moder_sn`,
 		`mod_time`,
-		`tstm`
+		`tstm`,
+		is_map_show
 		from third_merchant_biz
 		where third_party_merch_code = #{thirdMerchantCode}
 	</select>
@@ -85,7 +89,7 @@
     		`create_time`,
     		`moder_sn`,
     		`mod_time`,
-    		`tstm`
+    		`tstm`,is_map_show
 		from third_merchant_biz
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
@@ -132,6 +136,7 @@
 			`is_valid`,
 			is_stock_share,
 			is_store_user_share,
+			is_map_show,
 			`creater_sn`,
 			`create_time`,
 			`moder_sn`,
@@ -144,6 +149,7 @@
 			#{isValid},
 			#{isStockShare},
 			#{isStoreUserShare},
+			#{isMapShow},
 			#{createrSn},
 			#{createTime},
 			#{moderSn},
@@ -160,6 +166,7 @@
 			<if test="isValid != null">`is_valid` = #{isValid}, </if>
 			<if test="isStockShare != null">`is_stock_share` = #{isStockShare}, </if>
 			<if test="isStoreUserShare != null">`is_store_user_share` = #{isStoreUserShare}, </if>
+			<if test="isStoreUserShare != null">`is_store_user_share` = #{isStoreUserShare}, </if>
 			<if test="createrSn != null">`creater_sn` = #{createrSn}, </if>
 			<if test="createTime != null">`create_time` = #{createTime}, </if>
 			<if test="moderSn != null">`moder_sn` = #{moderSn}, </if>

kmall-admin/src/main/webapp/WEB-INF/page/shop/goods.html

@@ -150,11 +150,11 @@
         <i-form ref="formValidate" :model="goods" :rules="ruleValidate" :label-width="140">
         <Tabs value="name1">
             <Tab-Pane label="通用信息" name="name1">
-                <Row>
-                    <i-col span="16" style="margin-top: -10px;">
-                        <span style="margin-left: 140px;color: red;font-size: 12px;">* 修改商品二级分类将清空商品参数列表</span>
-                    </i-col>
-                </Row>
+                <!--<Row>-->
+                    <!--<i-col span="16" style="margin-top: -10px;">-->
+                        <!--<span style="margin-left: 140px;color: red;font-size: 12px;">* 修改商品二级分类将清空商品参数列表</span>-->
+                    <!--</i-col>-->
+                <!--</Row>-->
                 <!--<i-form ref="formValidate" :model="goods" :rules="ruleValidate" :label-width="80">-->
                 <Form-item label="商户" prop="merchSn">
                         <i-select v-model="goods.merchSn" filterable placeholder="商户" @on-change="showMerchInfo" label-in-value>

kmall-admin/src/main/webapp/WEB-INF/page/shop/thirdmerchantbiz.html

@@ -45,6 +45,11 @@
             <Form-item label="第三方商户名称" prop="thirdPartyMerchName">
                 <i-input v-model="thirdMerchantBiz.thirdPartyMerchName" placeholder="第三方商户名称"/>
             </Form-item>
+            <Row>
+                <i-col span="16" style="margin-top: -10px;">
+                    <span style="margin-left: 140px;color: red;font-size: 12px;">* 选择是，该商户下的所有门店商品库存将共享扣减</span>
+                </i-col>
+            </Row>
             <Form-item label="库存是否共享" prop="isStockShare" v-show="isOperate">
                 <Radio-group v-model="thirdMerchantBiz.isStockShare">
                     <Radio label="1">
@@ -55,8 +60,18 @@
                     </Radio>
                 </Radio-group>
             </Form-item>
-            <Form-item label="门店用户是否共享" prop="isStoreUserShare" v-show="isOperate">
-                <Radio-group v-model="thirdMerchantBiz.isStoreUserShare">
+            <!--<Form-item label="门店用户是否共享" prop="isStoreUserShare" v-show="isOperate">-->
+                <!--<Radio-group v-model="thirdMerchantBiz.isStoreUserShare">-->
+                    <!--<Radio label="1">-->
+                        <!--<span>是</span>-->
+                    <!--</Radio>-->
+                    <!--<Radio label="0">-->
+                        <!--<span>否</span>-->
+                    <!--</Radio>-->
+                <!--</Radio-group>-->
+            <!--</Form-item>-->
+            <Form-item label="商户地图是否显示" prop="isMapShow" v-show="isOperate">
+                <Radio-group v-model="thirdMerchantBiz.isMapShow">
                     <Radio label="1">
                         <span>是</span>
                     </Radio>
@@ -65,6 +80,7 @@
                     </Radio>
                 </Radio-group>
             </Form-item>
+
             <Form-item label="是否有效" prop="isValid">
                 <Radio-group v-model="thirdMerchantBiz.isValid">
                     <Radio label="1">

kmall-admin/src/main/webapp/js/shop/thirdmerchantbiz.js

@@ -25,7 +25,15 @@ $(function () {
             //         }
             //         return '';
             //     }},
-
+            {label: '商户地图是否显示', name: 'isMapShow', index: 'isMapShow', width: 80, align: 'center',
+                formatter: function (value) {
+                    if (value == '0') {
+                        return '否';
+                    } else if (value == '1') {
+                        return '是';
+                    }
+                    return '';
+                }},
 			{label: '是否有效', name: 'isValid', index: 'is_valid', width: 80, align: 'center',
                 formatter: function (value) {
                     if (value == '0') {
@@ -74,7 +82,7 @@ let vm = new Vue({
 	data: {
         showList: true,
         title: null,
-		thirdMerchantBiz: {isValid: '', isStockShare:'',isStoreUserShare:''},
+		thirdMerchantBiz: {isValid: '', isStockShare:'',isStoreUserShare:'',isMapShow:''},
 		ruleValidate: {
 			name: [
 				{required: true, message: '名称不能为空', trigger: 'blur'}
@@ -94,7 +102,7 @@ let vm = new Vue({
 			vm.showList = false;
 			vm.title = "新增";
             vm.getMerchList();
-			vm.thirdMerchantBiz = {isValid: 0,isStockShare:0,isStoreUserShare:0};
+			vm.thirdMerchantBiz = {isValid: 0,isStockShare:0,isStoreUserShare:0,isMapShow:0};
 			vm.isOperate = true;
 		},
 		update: function (event) {
@@ -111,7 +119,25 @@ let vm = new Vue({
 		},
 		saveOrUpdate: function (event) {
             let url = vm.thirdMerchantBiz.thirdMerchSn == null ? "../thirdmerchantbiz/save" : "../thirdmerchantbiz/update";
-            confirm('库存是否共享添加成功后则不可修改！确定添加？', function () {
+            if(vm.isOperate){
+                confirm('库存是否共享，商户地图是否显示字段添加成功后则不可修改！请确认后添加？', function () {
+                    $.ajax({
+                        type: "POST",
+                        url: url,
+                        contentType: "application/json",
+                        data: JSON.stringify(vm.thirdMerchantBiz),
+                        success: function (r) {
+                            if (r.code === 0) {
+                                alert('操作成功', function (index) {
+                                    vm.reload();
+                                });
+                            } else {
+                                alert(r.msg);
+                            }
+                        }
+                    });
+                })
+            }else{
                 $.ajax({
                     type: "POST",
                     url: url,
@@ -127,7 +153,7 @@ let vm = new Vue({
                         }
                     }
                 });
-            })
+            }
 		},
 		del: function (event) {
             let thirdMerchSns = getSelectedRows();

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

@@ -4,10 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Maps;
 import com.kmall.api.annotation.IgnoreAuth;
 import com.kmall.api.entity.*;
-import com.kmall.api.service.ApiMerchUserService;
-import com.kmall.api.service.ApiStoreService;
-import com.kmall.api.service.ApiUserService;
-import com.kmall.api.service.TokenService;
+import com.kmall.api.service.*;
 import com.kmall.api.util.ApiBaseAction;
 import com.kmall.api.util.ApiUserUtils;
 import com.kmall.api.util.CommonUtil;
@@ -44,6 +41,8 @@ public class ApiAuthController extends ApiBaseAction {
     private ApiStoreService apiStoreService;
     @Autowired
     private ApiMerchUserService apiMerchUserService;
+    @Autowired
+    private ApiThirdMerchantBizService apiThirdMerchantBizService;
 
     /**
      * 登录
@@ -71,6 +70,7 @@ public class ApiAuthController extends ApiBaseAction {
         String requestUrl = ApiUserUtils.getWebAccess(code);//通过自定义工具类组合出小程序需要的登录凭证 code
         logger.info("》》》组合token为：" + requestUrl);
         JSONObject sessionData = CommonUtil.httpsRequest(requestUrl, "GET", null);
+        logger.info("》》》sessionData为：" + sessionData);
 
         if (null == sessionData) {
             return toResponsFail("登录失败");
@@ -133,18 +133,37 @@ public class ApiAuthController extends ApiBaseAction {
         }
     }
 
-
-
     /**
-     * 根据经纬度选择门店
+     * 根据经纬度选择门店，微信审核后删除
      */
     @GetMapping("nearbyList")
     @IgnoreAuth
-    public Object nearbyList(@RequestParam BigDecimal latitude, @RequestParam BigDecimal longitude,@RequestParam String storeId) {
+    public Object nearbyList(@RequestParam BigDecimal latitude, @RequestParam BigDecimal longitude, @RequestParam String storeId) {
+        Map param = Maps.newHashMap();
+         if(org.apache.commons.lang3.StringUtils.isNotEmpty(storeId)){
+            param.put("storeId", storeId);
+        }
+        param.put("latitude", latitude);
+        param.put("longitude", longitude);
+        List<StoreVo> storeVoList = apiStoreService.queryNearbyList(param);
+        if (null != storeVoList && storeVoList.size() > 0 && null != getOpenId()) {
+            tokenService.createAndUpdateToken(getOpenId(), storeVoList.get(0).getId(),getUserId(),storeVoList.get(0).getMerchSn());
+        }
+        return toResponsSuccess(storeVoList);
+    }
+    /**
+     * 根据经纬度选择门店
+     */
+    @GetMapping("nearbyLists")
+    @IgnoreAuth
+    public Object nearbyLists(@RequestParam BigDecimal latitude, @RequestParam BigDecimal longitude, @RequestParam String storeId,@RequestParam String thirdPartyMerchCode) {
         Map param = Maps.newHashMap();
         if(org.apache.commons.lang3.StringUtils.isNotEmpty(storeId)){
             param.put("storeId", storeId);
         }
+        if(org.apache.commons.lang3.StringUtils.isNotEmpty(thirdPartyMerchCode)){
+            param.put("thirdPartyMerchCode", thirdPartyMerchCode);
+        }
         param.put("latitude", latitude);
         param.put("longitude", longitude);
         List<StoreVo> storeVoList = apiStoreService.queryNearbyList(param);
@@ -211,6 +230,7 @@ public class ApiAuthController extends ApiBaseAction {
                 apiMerchUserService.save(merchUserVo);
             }
         }
-        return toResponsSuccess("1");
+        ThirdMerchantBizVo thirdMerchantBizVo = apiThirdMerchantBizService.queryDataByStoreId(storeId);
+        return toResponsSuccess(thirdMerchantBizVo);
     }
 }

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

@@ -507,7 +507,7 @@ public class ApiGoodsController extends ApiBaseAction {
         params.put("store_id", store_id);
         if (!StringUtils.isNullOrEmpty(sort) && !StringUtils.isNullOrEmpty(order)) {
             if (sort.equals("price")) {
-                params.put("sidx", "a.retail_price");
+                params.put("sidx", "psr1.retail_price");
                 params.put("order", order);
             }
         }
@@ -663,20 +663,33 @@ public class ApiGoodsController extends ApiBaseAction {
                               @RequestParam(value = "page", defaultValue = "1") Integer
                                       page, @RequestParam(value = "size", defaultValue = "10") Integer size,
                               String sort, String order) {
+        Long storeId = getStoreId();
         Map params = Maps.newHashMap();
         params.put("is_new", isNew);
         params.put("page", page);
         params.put("limit", size);
         params.put("order", sort);
         params.put("sidx", order);
-        params.put("store_id", getStoreId());
+        params.put("store_id", storeId);
+        StoreVo storeVo = apiStoreService.queryObject(storeId);
+        String isStockShare = "";
+        if(storeVo != null) {
+            ThirdMerchantBizVo thirdMerchantBiz = apiThirdMerchantBizService.getThirdMerchangByCode(storeVo.getThirdPartyMerchCode());
+            if (null == thirdMerchantBiz) {
+                return toResponsFail("第三方商户为空");
+            }
+            isStockShare = thirdMerchantBiz.getIsStockShare();
+        }
         //
         if (null != sort && sort.equals("price")) {
             params.put("sidx", "psr1.retail_price");
             params.put("order", order);
-        } else if (null != sort && sort.equals("sell")) {
+        } else if (null != sort && sort.equals("sell") && Dict.isStockShare.item_0.getItem().equalsIgnoreCase(isStockShare)) {
             params.put("sidx", "psr1.sell_volume");
             params.put("order", order);
+        } else if (null != sort && sort.equals("sell") && Dict.isStockShare.item_1.getItem().equalsIgnoreCase(isStockShare)) {
+            params.put("sidx", "a.sell_volume");
+            params.put("order", order);
         } else {
             params.put("sidx", "id");
             params.put("order", "desc");
@@ -703,19 +716,12 @@ public class ApiGoodsController extends ApiBaseAction {
         // 当前购物车中
         List<CartVo> cartList = new ArrayList();
         if (null != getUserId()) {
-            Long storeId = getStoreId();
             //查询列表数据
             Map cartParam = Maps.newHashMap();
             cartParam.put("user_id", getUserId());
             cartParam.put("store_id", storeId);
-            StoreVo storeVo = apiStoreService.queryObject(storeId);
-            if(storeVo != null) {
-                ThirdMerchantBizVo thirdMerchantBiz = apiThirdMerchantBizService.getThirdMerchangByCode(storeVo.getThirdPartyMerchCode());
-                if (null == thirdMerchantBiz) {
-                    return toResponsFail("第三方商户为空");
-                }
-                cartParam.put("isStockShare", thirdMerchantBiz.getIsStockShare());
-            }
+            cartParam.put("isStockShare", isStockShare);
+
             cartList = cartService.queryList(cartParam);
         }
         if (null != cartList && cartList.size() > 0 && null != goodsList && goodsList.size() > 0) {

kmall-api/src/main/java/com/kmall/api/dao/ApiThirdMerchantBizMapper.java

@@ -13,4 +13,5 @@ import org.springframework.stereotype.Component;
 @Component
 public interface ApiThirdMerchantBizMapper extends BaseDao<ThirdMerchantBizVo> {
     ThirdMerchantBizVo getThirdMerchangByCode(@Param("thirdMerchantCode")String thirdMerchantCode);
+    ThirdMerchantBizVo queryDataByStoreId(@Param("storeId")Long storeId);
 }

kmall-api/src/main/java/com/kmall/api/entity/ThirdMerchantBizVo.java

@@ -59,6 +59,16 @@ public class ThirdMerchantBizVo implements Serializable {
      */
     private Date tstm;
 
+    private String isMapShow;
+
+    public String getIsMapShow() {
+        return isMapShow;
+    }
+
+    public void setIsMapShow(String isMapShow) {
+        this.isMapShow = isMapShow;
+    }
+
     public String getIsStoreUserShare() {
         return isStoreUserShare;
     }

kmall-api/src/main/java/com/kmall/api/service/ApiThirdMerchantBizService.java

@@ -59,4 +59,9 @@ public class ApiThirdMerchantBizService {
     public ThirdMerchantBizVo getThirdMerchangByCode(String thirdMerchantCode) {
         return thirdMerchantBizMapper.getThirdMerchangByCode(thirdMerchantCode);
     }
+
+    public ThirdMerchantBizVo queryDataByStoreId(Long storeId) {
+        return thirdMerchantBizMapper.queryDataByStoreId(storeId);
+    }
+
 }

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

@@ -238,6 +238,7 @@
         LEFT JOIN mall_product_store_rela psr1 ON a.id = psr1.goods_id and a.merch_sn = psr1.merch_sn
         left join third_merchant_biz mb on mb.third_party_merch_code = a.third_party_merch_code and mb.merch_sn=a.merch_sn
         LEFT JOIN mall_product b ON b.id = psr1.product_id
+        left join mall_category c on psr1.category_id = c.id
         where 1 = 1
         <if test="isStockShare == 1">
             and (a.goods_number > 0  or psr1.stock_num > 0 )
@@ -268,7 +269,7 @@
             </foreach>
         </if>
         <if test="category_parent_id != null and category_parent_id != null">
-            and FIND_IN_SET(psr1.category_id, getCategoryChildLst(#{category_parent_id}))
+            and FIND_IN_SET(c.parent_id, getCategoryChildLst(#{category_parent_id}))
         </if>
         <if test="goods_ids != null">
             and a.id in

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

@@ -175,9 +175,12 @@
         <if test="county_name != null and county_name.trim() != ''">
             AND county_name = #{county_name}
         </if>
-        <if test="storeId != null ">
+        <if test="storeId != null and storeId != '' ">
             AND a.id = #{storeId}
         </if>
+        <if test="thirdPartyMerchCode != null and thirdPartyMerchCode.trim() != '' ">
+            AND a.third_party_merch_code = #{thirdPartyMerchCode}
+        </if>
         ) tmp
         order by distance asc
         limit 0, 10

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

@@ -16,6 +16,7 @@
         <result property="moderSn" column="moder_sn"/>
         <result property="modTime" column="mod_time"/>
         <result property="tstm" column="tstm"/>
+		<result property="isMapShow" column="is_map_show"/>
     </resultMap>
 
 	<select id="queryObject" resultType="com.kmall.api.entity.ThirdMerchantBizVo">
@@ -27,6 +28,7 @@
 			`is_valid`,
 			is_stock_share,
 			is_store_user_share,
+			is_map_show,
 			`creater_sn`,
 			`create_time`,
 			`moder_sn`,
@@ -45,6 +47,7 @@
 		`is_valid`,
 		is_stock_share,
 		is_store_user_share,
+		is_map_show,
 		`creater_sn`,
 		`create_time`,
 		`moder_sn`,
@@ -63,6 +66,7 @@
 		`is_valid`,
 		is_stock_share,
 		is_store_user_share,
+		is_map_show,
 		`creater_sn`,
 		`create_time`,
 		`moder_sn`,
@@ -72,6 +76,20 @@
 		where third_party_merch_code = #{thirdMerchantCode}
 	</select>
 
+	<select id="queryDataByStoreId" resultType="com.kmall.api.entity.ThirdMerchantBizVo">
+		select
+		b.`third_merch_sn`,
+		b.`merch_sn`,
+		b.`third_party_merch_code`,
+		b.`third_party_merch_name`,
+		b.`is_valid`,
+		b.is_stock_share,
+		b.is_store_user_share,
+		b.is_map_show
+		from third_merchant_biz b inner join mall_store s on s.third_party_merch_code=b.third_party_merch_code
+		where s.id = #{storeId}
+	</select>
+
 	<select id="queryList" resultType="com.kmall.api.entity.ThirdMerchantBizVo">
 		select
     		`third_merch_sn`,
@@ -80,7 +98,8 @@
     		`third_party_merch_name`,
     		`is_valid`,
 			is_stock_share,
-		is_store_user_share,
+			is_store_user_share,
+			is_map_show,
     		`creater_sn`,
     		`create_time`,
     		`moder_sn`,

wx-mall/config/api.js

@@ -1,7 +1,7 @@
 //开发环境
 //var NewApiRootUrl = 'http://localhost:8080/api/';
 //var NewApiRootUrl = 'http://192.168.1.138:8080/api/';
-// var NewApiRootUrl = 'http://qhdswl.f3322.net:9001/platform-framework/api/';//hyq
+// var NewApiRootUrl = 'http://qhdswl.f3322.net:9001/framework/api/';//hyq
 // var NewApiRootUrl = 'http://qhdswl.f3322.net:9003/api/';
 
 //测试环境
@@ -20,7 +20,7 @@ module.exports = {
     // 权限
     AuthLoginByWeixin: NewApiRootUrl + 'auth/login_by_weixin', //微信登录
     ChooseStoreId: NewApiRootUrl + 'auth/chooseStoreId', //选择门店Id
-    NearbyList: NewApiRootUrl + 'auth/nearbyList',//根据经纬度获取配送范围内的门店
+    NearbyList: NewApiRootUrl + 'auth/nearbyLists',//根据经纬度获取配送范围内的门店
     StoreByCity: NewApiRootUrl + 'auth/storeListByCity',//获取地市的门店
     //
     ActivityList: NewApiRootUrl + 'activity/list', //活动列表

wx-mall/pages/cart/cart.js

@@ -73,10 +73,6 @@ Page({
         });
         that.getCartList();
         that.getFootprintList();
-      }else{
-        wx.switchTab({
-          url: '/pages/index/index'
-        });
       }
     } else {
       wx.navigateTo({

wx-mall/pages/catalog/catalog.js

@@ -91,9 +91,21 @@ Page({
         }
       }
 
-      if (that.data.goodsList.length == 0) {
+      if (that.data.goodsList.length == 0 || wx.getStorageSync('storeId') != wx.getStorageSync('mapCatalogStoreId')) {
+        wx.setStorageSync('mapCatalogStoreId', wx.getStorageSync('storeId'));
+        that.setData({
+          page: 1
+        });
         that.getCategoryData();
-      }
+      } 
+      // if (wx.getStorageSync('storeId') != wx.getStorageSync('mapCatalogStoreId')) {
+      //   wx.setStorageSync('mapCatalogStoreId', wx.getStorageSync('storeId'));
+      //   that.setData({
+      //     page: 1
+      //   });
+      //   that.getCategoryData();
+      // }
+      
       wx.hideLoading();
     });
     util.request(api.GoodsCount).then(function (res) {
@@ -139,10 +151,6 @@ Page({
         });
         that.getFootCart();
         that.getCatalog();
-      } else {
-        wx.switchTab({
-          url: '/pages/index/index'
-        });
       }
     } else {
       wx.navigateTo({

wx-mall/pages/catalog/catalog.wxml

@@ -107,8 +107,7 @@
           <text class="txt">{{item.name?item.name:""}}</text>
         </navigator>
       </view>
-      
-      <view class="sort" wx:if="{{goodsList.length > 0 }}">
+      <view class="sort">
         <view class="sort-box">
           <view class="item {{currentSortType == 'default' ? 'active' : ''}}" bindtap="openSortFilter" id="defaultSort">
             <text class="txt">综合</text>

wx-mall/pages/catalog/catalog.wxss

@@ -186,12 +186,13 @@ page {
 }
 
 .sort-box {
-  background: #fff;
+  background: rgb(250, 247, 247);
   width: 100%;
   height: 78rpx;
   overflow: hidden;
-  padding: 0 30rpx;
+  /* padding: 0 30rpx; */
   display: flex;
+  margin-top:20rpx;
 }
 
 .sort-box .item {
@@ -251,7 +252,7 @@ page {
   height: auto;
   overflow: hidden;
   border-top: 1rpx solid #f4f4f4;
-  margin-top: 20rpx;
+  /* margin-top: 20rpx; */
   margin-bottom: 200rpx;
 }
 

wx-mall/pages/index/index.js

@@ -22,6 +22,7 @@ Page({
     size: 3,
     list: [],
     openAttr: false,
+    isMapShow: ''
   },
   showCouponPop() {
     let that = this;
@@ -65,7 +66,17 @@ Page({
           // groupBanner: res.data.groupBanner,
           channel: res.data.channel
         });
-        if (that.data.hotGoods.length==0){
+        // console.log(that.data.hotGoods.length)
+        // console.log(wx.getStorageSync('storeId'))
+        // console.log(wx.getStorageSync('mapIndexStoreId'))
+        if (that.data.hotGoods.length == 0){
+          that.getGoodsList();
+        }
+        if (wx.getStorageSync('storeId') != wx.getStorageSync('mapIndexStoreId')){
+          that.setData({
+            hotGoods: [],
+            page: 1
+          });
           that.getGoodsList();
         }
       }
@@ -103,8 +114,8 @@ Page({
   onLoad: function (options) {
     let that = this;
     wx.setStorageSync("navUrl", "/pages/index/index");
+    // options.scene = 38;
     if (options.scene) {
-      console.log("has scene");
       var scene = decodeURIComponent(options.scene);
       console.log("scene is ", scene);
       that.setData({
@@ -112,6 +123,7 @@ Page({
       });
       wx.setStorageSync('storeId', scene);
     } else {
+      wx.removeStorageSync('storeId');
       console.log("no scene");
     }
   },
@@ -186,6 +198,11 @@ Page({
           },
           success: function (wxRes) {
             if (wxRes.data.errno === 0) {
+              that.setData({
+                isMapShow: wxRes.data.data.isMapShow
+              });
+              wx.setStorageSync('thirdPartyMerchCode', wxRes.data.data.thirdPartyMerchCode);
+              // console.log(that.data.isMapShow)
               // console.log("用户信息更新成功");
             }
           },
@@ -206,43 +223,37 @@ Page({
     //获取附件门店信息
     util.getLocation((lng, lat) => {
       wx.setStorageSync('location', JSON.stringify({ lng, lat }));
-      util.request(api.NearbyList, { longitude: lng, latitude: lat, storeId: that.data.storeId }).then((res) => {
+      let storeId = wx.getStorageSync('storeId');
+      util.request(api.NearbyList, { longitude: lng, latitude: lat, storeId: storeId, thirdPartyMerchCode: '' }).then((res) => {
         let nlist = res.data;
-        // console.log(nlist);
-        wx.removeStorageSync('nearStoreList');
-        wx.removeStorageSync('storeId');
-        wx.removeStorageSync('storeVo');
-        // console.log('sasas:' + wx.getStorageSync('currentCategory'));
+        // wx.removeStorageSync('nearStoreList');
+        // wx.removeStorageSync('storeId');
+        // wx.removeStorageSync('storeVo');
+        // wx.setStorageSync('storeId', storeId);
         if (!wx.getStorageSync('currentCategory')) {
           wx.removeStorageSync('currentCategory');
         }
         if (!nlist.length) {
           wx.removeStorageSync('nearStoreList');
+          wx.removeStorageSync('mapIndexStoreId');
         } else {
           wx.setStorageSync('nearStoreList', JSON.stringify(nlist));
+          wx.setStorageSync('mapIndexStoreId', nlist[0].id);
         }
-        if (!wx.getStorageSync('storeId')) {
-          if (!nlist.length) {
-            wx.removeStorageSync('storeId');
-            wx.removeStorageSync('storeVo');
-            that.setData({
-              storeName: '附近暂无门店'
-            })
-          } else {
-            that.setData({
-              storeName: nlist[0].storeName,
-              storeId: nlist[0].id
-            })
-            that.chooseStore(nlist[0].id, nlist[0].merchSn);
-            wx.setStorageSync('storeVo', JSON.stringify(nlist[0]));
-          }
+
+        if (!nlist.length) {
+          wx.removeStorageSync('storeId');
+          wx.removeStorageSync('storeVo');
+          that.setData({
+            storeName: '附近暂无门店'
+          })
         } else {
-          var storeVo = JSON.parse(wx.getStorageSync('storeVo'));
-          that.chooseStore(storeVo.id, storeVo.merchSn);
           that.setData({
-            storeName: storeVo.storeName,
-            storeId: storeVo.id
-          });
+            storeName: nlist[0].storeName,
+            storeId: nlist[0].id
+          })
+          that.chooseStore(nlist[0].id, nlist[0].merchSn);
+          wx.setStorageSync('storeVo', JSON.stringify(nlist[0]));
         }
       })
     });
@@ -525,7 +536,6 @@ Page({
   },
 
   shows: function (e) {
-
     wx.redirectTo({
       url: '/pages/images/images'
     })

wx-mall/pages/index/index.wxml

@@ -24,8 +24,8 @@
     <image src="../../static/images/service-sao.png" class="search-icon-shop" bindtap="scanGoodsCode"></image>
   </view>
   <view class="home-header">
-    <!-- <view bindtap="handleStore" class="current-store arrow arrow-down">{{ storeName }}</view> -->
-    <view class="current-store">{{ storeName }}</view>
+    <view bindtap="handleStore" class="current-store arrow arrow-down" wx:if="{{isMapShow == 1}}">{{ storeName }}</view>
+    <view class="current-store" wx:if="{{isMapShow == 0}}">{{ storeName }}</view>
   </view>
 
   <swiper class="banner" indicator-dots="true" autoplay="true" interval="15000" duration="750">

wx-mall/pages/index/index.wxss

@@ -303,15 +303,17 @@
   justify-content: center;
   overflow: hidden;
   height: 264rpx;
-  width: 456rpx;
+  width: 446rpx;
+  margin-left:30rpx;
 }
 
 .a-popular .b .name {
-  width: 456rpx;
+  /* width: 456rpx; */
   display: block;
   color: #333;
   line-height: 50rpx;
-  font-size: 26rpx;
+  font-size: 30rpx;
+  /* font-weight: bolder; */
 }
 
 .a-popular .b .desc {

wx-mall/pages/map/map.js

@@ -30,13 +30,17 @@ Page({
     this.setData({
       nearStoreList: nearStoreList
     })
-  
+    // console.log(nearStoreList)
+    let thirdPartyMerchCode = wx.getStorageSync('thirdPartyMerchCode') ? wx.getStorageSync('thirdPartyMerchCode') : '';
+    // console.log(thirdPartyMerchCode)
     let that = this;
     util.getLocation((lng, lat) => {
-      util.request(api.NearbyList, { longitude: lng, latitude: lat }).then((res) => {
+      util.request(api.NearbyList, { longitude: lng, latitude: lat, storeId:'', thirdPartyMerchCode: thirdPartyMerchCode }).then((res) => {
+
         let markers = [];
         let points = [];
         let nlist = res.data;
+        // console.log(nlist);
         for (var i = 0; i < nlist.length; i++) {
           let marker = {
             iconPath: "/static/images/address.png",
@@ -53,12 +57,13 @@ Page({
             merchSn: nlist[i].merchSn
           };
           markers.push(marker);
-
+          // console.log(markers);
           let point = {
             latitude: nlist[i].latitude,
             longitude: nlist[i].longitude,
           };
           points.push(point);
+          // console.log(points);
         }
 
         this.mapCtx.includePoints({
@@ -116,9 +121,12 @@ Page({
         wx.removeStorageSync('storeId');
         wx.removeStorageSync('storeVo');
         wx.removeStorageSync('currentCategory');
+        wx.removeStorageSync('mapStoreId');
         wx.setStorageSync('storeId', storeId);
         var item = "";
         for (var i = 0; i < that.data.nearStoreList.length; i++) {
+          wx.setStorageSync('mapIndexStoreId', that.data.nearStoreList[i].id);//地图切换的门店id，提供给首页tab页做条件
+          wx.setStorageSync('mapCatalogStoreId', that.data.nearStoreList[i].id);//地图切换的门店id，提供给分类tab页做条件
           if (storeId == that.data.nearStoreList[i].id) {
             item = that.data.nearStoreList[i];
             wx.setStorageSync('storeVo', JSON.stringify(item));
@@ -129,25 +137,20 @@ Page({
         var pages = getCurrentPages();
         var currPage = pages[pages.length - 1];  //当前页面
         var prevPage = pages[pages.length - 2]; //上一个页面
+        // console.log(item)
         if (item == "") {
-          wx.removeStorageSync('nearStoreList');
-          wx.removeStorageSync('storeId');
-          wx.removeStorageSync('storeVo');
-          that.setData({
-            storeName: '附近暂无门店'
-          })
+          // wx.removeStorageSync('nearStoreList');
+          // wx.removeStorageSync('storeId');
+          // wx.removeStorageSync('storeVo');
+          // that.setData({
+          //   storeName: '附近暂无门店'
+          // })
         } else {
           //直接调用上一个页面的setData()方法，把数据存到上一个页面中去
           prevPage.setData({
             storeName: item.storeName
           })
-          // that.setData({
-          //   storeName: item.storeName
-          // })
         }
-        // wx.switchTab({
-        //   url: '/pages/index/index'
-        // });
 
         prevPage.getIndexData();
         prevPage.enableActivity();

wx-mall/project.config.json

@@ -9,7 +9,7 @@
 		"uglifyFileName": true
 	},
 	"compileType": "miniprogram",
-	"libVersion": "2.6.0",
+	"libVersion": "2.6.2",
 	"appid": "wxb6b30b1b14ee502a",
 	"projectname": "kmall-mp",
 	"condition": {