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

kmall-admin/src/main/java/com/kmall/admin/controller/StoreController.java

@@ -98,6 +98,23 @@ public class StoreController {
     @RequiresPermissions("store:update")
     @ResponseBody
     public R update(@RequestBody StoreEntity store) {
+        SysUserEntity user = ShiroUtils.getUserEntity();
+        if(user == null) {
+            return R.error("用户登录超时，请重新登录");
+        }
+        Map<String, Object> valideDate = MapBeanUtil.fromObject(store);
+        ImmutableBiMap.Builder builder = new ImmutableBiMap.Builder();
+        builder.put("merchSn", "商户");
+        builder.put("storeName", "门店名称");
+        builder.put("storeNumber", "门店编号");
+        builder.put("thirdPartyMerchCode", "第三方商户编号");
+        builder.put("thirdPartyMerchName", "第三方商户名称");
+        builder.put("latitude", "纬度");
+        builder.put("longitude", "经度");
+        R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
+        if (Integer.valueOf(r.get("code").toString()) != 0) {
+            throw new RRException(r.get("msg").toString());
+        }
         storeService.update(store);
 
         return R.ok();

kmall-admin/src/main/java/com/kmall/admin/service/impl/CategoryServiceImpl.java

@@ -103,6 +103,7 @@ public class CategoryServiceImpl implements CategoryService {
                     for (CategoryEntity categoryEntity : categoryEntityList) {
                         map.clear();
                         map.put("categoryId", categoryEntity.getId());
+                        map.put("isDelete", Dict.isDelete.item_1.getItem());
                         List<GoodsEntity> goodsEntityList = goodsDao.queryList(map);
                         if (goodsEntityList != null) {
                             goodsTotal += goodsEntityList.size();

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsServiceImpl.java

@@ -156,7 +156,7 @@ public class GoodsServiceImpl implements GoodsService {
         map.put("goodsBizType", goods.getGoodsBizType());
         List<GoodsEntity> list = querySame(map);
         if (list != null && list.size() != 0) {
-            throw new RRException("已存在该商品编码或该货品业务类型下已存在此SKU！");
+            throw new RRException("已存在该商品编码，或该货品业务类型下已存在此SKU！");
         }
 
         // 添加商品
@@ -298,7 +298,7 @@ public class GoodsServiceImpl implements GoodsService {
         map.put("id", goods.getId());
         List<GoodsEntity> list = querySame(map);
         if (list != null && list.size() != 0) {
-            throw new RRException("已存在该商品编码或该货品业务类型下已存在此SKU！");
+            throw new RRException("已存在该商品编码，或该货品业务类型下已存在此SKU！");
         }
 
         // 修改商品

kmall-admin/src/main/resources/conf/db.properties

@@ -47,3 +47,46 @@ jdbc.validationTimeout=4000
 #jdbc.connectionTimeout=5000
 #jdbc.maximumPoolSize=5
 #jdbc.validationTimeout=4000
+
+
+###========== 中网国际数据库开发环境 ==========
+#jdbc.url=jdbc:mysql://120.76.84.45:3306/kmall_pt_global?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+#jdbc.username=tuser
+#jdbc.password=Qq!123
+#
+#jdbc.initialSize=5
+#jdbc.maxActive=30
+#
+#jdbc.minPoolSize=2+
+#jdbc.maxIdleTime=30000
+#jdbc.idleConnectionTestPeriod=100
+#
+##---------- for hikari
+#jdbc.driver=org.mariadb.jdbc.Driver
+#jdbc.idleTimeout=400000
+#jdbc.maxLifetime=500000
+#jdbc.connectionTimeout=5000
+#jdbc.maximumPoolSize=5
+#jdbc.validationTimeout=4000
+
+
+###========== 中网国际数据库生产环境 ==========
+##阿里云外网地址
+#jdbc.url=jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_pt_global?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+#jdbc.username=kmall_pt
+#jdbc.password=AFnwRBu!3q
+#
+#jdbc.initialSize=5
+#jdbc.maxActive=30
+#
+#jdbc.minPoolSize=2
+#jdbc.maxIdleTime=30000
+#jdbc.idleConnectionTestPeriod=100
+#
+##---------- for hikari
+#jdbc.driver=org.mariadb.jdbc.Driver
+#jdbc.idleTimeout=400000
+#jdbc.maxLifetime=500000
+#jdbc.connectionTimeout=5000
+#jdbc.maximumPoolSize=5
+#jdbc.validationTimeout=4000

kmall-admin/src/main/resources/conf/redis.properties

@@ -13,7 +13,7 @@ redis.dev.pool.maxTotal=10000
 redis.dev.pool.testOnBorrow=true
 
 
-# 生产环境
+# 中网生产环境
 redis.prod.keyPrefix=platform
 redis.prod.host=183.3.221.143
 redis.prod.port=6379
@@ -21,3 +21,12 @@ redis.prod.pool.maxIdle=200
 redis.prod.pool.maxWait=1000
 redis.prod.pool.maxTotal=10000
 redis.prod.pool.testOnBorrow=true
+
+## 中网国际生产环境
+#redis.prod.keyPrefix=platform
+#redis.prod.host=183.62.225.124
+#redis.prod.port=6379
+#redis.prod.pool.maxIdle=200
+#redis.prod.pool.maxWait=1000
+#redis.prod.pool.maxTotal=10000
+#redis.prod.pool.testOnBorrow=true

kmall-admin/src/main/resources/conf/wx-global.properties

@@ -6,9 +6,9 @@ pay.wx.global.env = dev
 
 #========== 开发环境 ==========
 #小程序ID
-wx.global.dev.appId=wxb6b30b1b14ee502a
+wx.global.dev.appId=wx59c05dcbb3ef2f36
 #小程序密钥
-wx.global.dev.secret=be0234dbbbde4ce68df43dd2b5e4c7b1
+wx.global.dev.secret=bb4029cd5149cbe5975bc14a99feaa9d
 #商户号
 wx.global.dev.mchId=103106626
 #支付签名
@@ -44,11 +44,10 @@ wx.global.dev.spbillCreateIp=127.0.0.1
 
 
 #========== 生产环境 ==========
-
 #小程序ID
-wx.global.prod.appId=wxb6b30b1b14ee502a
+wx.global.prod.appId=wx59c05dcbb3ef2f36
 #小程序密钥
-wx.global.prod.secret=be0234dbbbde4ce68df43dd2b5e4c7b1
+wx.global.prod.secret=bb4029cd5149cbe5975bc14a99feaa9d
 #商户号
 wx.global.prod.mchId=103106626
 #支付签名
@@ -58,7 +57,7 @@ wx.global.prod.tradeType=JSAPI
 #商户币种
 wx.global.prod.feeType=CNY
 #证书名称，对应不同的商户号
-wx.global.prod.certName=/cert/apiclient_cert.p12
+wx.global.prod.certName=/app/project/kmall_pt_global/cert/apiclient_cert.p12
 #支付回调地址
 wx.global.prod.notifyUrl=https://mp.k1net.cn/api/global/pay/notify
 #获取code的请求地址

kmall-admin/src/main/resources/conf/wx-mp.properties

@@ -57,7 +57,7 @@ wx.prod.paySignKey=Zx1245uytDLliom12345622222222222
 #交易类型
 wx.prod.tradeType=JSAPI
 #证书名称，对应不同的商户号
-wx.prod.certName=/cert/apiclient_cert.p12
+wx.prod.certName=/app/project/kmall_pt/cert/apiclient_cert.p12
 #支付回调地址
 wx.prod.notifyUrl=https://mp.k1net.cn/api/pay/notify
 #获取code的请求地址

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

@@ -33,12 +33,12 @@
         <p slot="title">{{title}}</p>
         <i-form ref="formValidate" :model="category" :rules="ruleValidate" :label-width="100">
             <Form-item label="商户" prop="merchSn">
-                <i-select v-model="category.merchSn" filterable placeholder="商户" @on-change="getStoresByMerch" label-in-value>
+                <i-select v-model="category.merchSn" placeholder="商户" @on-change="getStoresByMerch" label-in-value>
                     <i-option v-for="merch in merchList" :value="merch.merchSn" :key="merch.merchSn">{{merch.merchName}}</i-option>
                 </i-select>
             </Form-item>
             <Form-item label="门店" prop="storeId">
-                <i-select v-model="category.storeId" filterable placeholder="门店" label-in-value>
+                <i-select v-model="category.storeId" placeholder="门店" label-in-value>
                     <i-option v-for="store in storeList" :value="store.id" :key="store.id">{{store.storeName}}</i-option>
                 </i-select>
             </Form-item>

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

@@ -77,6 +77,11 @@ var vm = new Vue({
             }
             vm.showList = false;
             vm.title = "修改";
+            vm.attribute = {};
+            vm.attribute = { sortOrder: '' };
+            vm.categories = [];
+            vm.storeList = [];
+            vm.merchList = [];
 
             vm.getInfo(id);
             vm.getMerchList();

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

@@ -73,6 +73,7 @@ var vm = new Vue({
             }
             vm.showList = false;
             vm.title = "修改";
+            vm.attributeCategory = {enabled: '1'};
 
             vm.getInfo(id)
         },

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

@@ -122,6 +122,9 @@ var vm = new Vue({
             }
             vm.showList = false;
             vm.title = "修改";
+            vm.brand = {listPicUrl: '', picUrl: '', appListPicUrl: '', newPicUrl: '', isShow: 1, isNew: 0};
+            vm.storeList = [];
+            vm.merchList = [];
 
             vm.getInfo(id);
             vm.getMerchList();

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

@@ -118,6 +118,9 @@ var vm = new Vue({
             }
             vm.showList = false;
             vm.title = "修改";
+            vm.category = {isShow: 1, type: 0, level: 'L1', bannerUrl: '', iconUrl: '', imgUrl: '', wapBannerUrl: ''};
+            vm.storeList = [];
+            vm.merchList = [];
             vm.getInfo(id[0].id);
             vm.getMerchList();
             vm.getStoresByMerch();

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

@@ -166,6 +166,24 @@ let vm = new Vue({
             }
             vm.showList = false;
             vm.title = "修改";
+            vm.freight = {
+                name: '',
+                templateType: 0,
+                pricingManner: 0,
+                isDefault: false
+            };
+            vm.freightItemEntityList = [{
+                id: '',
+                freId: '',
+                deliveryArea: true,
+                firstPiece: '',
+                freight: '',
+                continuePiece: '',
+                renew: '',
+                isDelete: 0
+            }];
+            vm.storeList = [];
+            vm.merchList = [];
             vm.getInfo(id)
             vm.getMerchList();
             vm.getStoresByMerch();

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

@@ -63,12 +63,6 @@ let vm = new Vue({
             thirdPartyMerchName: [
                 {required: true, message: '第三方商户名称不能为空', trigger: 'blur'}
             ],
-            latitude: [
-                {required: true, message: '纬度不能为空', trigger: 'blur'}
-            ],
-            longitude: [
-                {required: true, message: '经度不能为空', trigger: 'blur'}
-            ],
         },
         q: {
             storeName: '',

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

@@ -151,8 +151,8 @@ public class ApiCouponController extends ApiBaseAction {
         //
         String phone = jsonParam.getString("phone");
         String smscode = jsonParam.getString("smscode");
-        UserVo userVo = apiUserService.queryByMobile(phone);
-        if(userVo != null){
+        List<UserVo> userVoList = apiUserService.queryByMobile(phone);
+        if(userVoList != null && userVoList.size() > 0){
             return toResponsFail("该手机号已绑定");
         }
         // 校验短信码

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

@@ -117,20 +117,20 @@ public class ApiPayController extends ApiBaseAction {
             String randomStr = CharUtil.getRandomNum(18).toUpperCase();
             parame.put("nonce_str", randomStr);// 随机字符串
             parame.put("out_trade_no", merchOrderSn);// 商户订单编号
-            parame.put("body", "商城-支付");// 商品描述
+            parame.put("body", "中网跨境商城-支付");// 商品描述
 
             //订单的商品
-            List<OrderGoodsVo> orderGoods = orderGoodsService.queryListByIds(orderIdList);
-            if (null != orderGoods) {
-                String body = "商城-";
-                for (OrderGoodsVo goodsVo : orderGoods) {
-                    body = body + goodsVo.getGoods_name() + "、";
-                }
-                if (body.length() > 0) {
-                    body = body.substring(0, body.length() - 1);
-                }
-                parame.put("body", body);// 商品描述
-            }
+//            List<OrderGoodsVo> orderGoods = orderGoodsService.queryListByIds(orderIdList);
+//            if (null != orderGoods) {
+//                String body = "商城-";
+//                for (OrderGoodsVo goodsVo : orderGoods) {
+//                    body = body + goodsVo.getGoods_name() + "、";
+//                }
+//                if (body.length() > 0) {
+//                    body = body.substring(0, body.length() - 1);
+//                }
+//                parame.put("body", body);// 商品描述
+//            }
             //支付金额
 //            parame.put("total_fee", orderInfo.getActual_price().multiply(Constant.ONE_HUNDRED).intValue()));//todo 消费金额
             parame.put("total_fee", actual_price.multiply(Constant.ONE_HUNDRED).intValue());// 消费金额

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

@@ -39,7 +39,7 @@ public class ApiUserController extends ApiBaseAction {
 
     /**
      */
-    @IgnoreAuth
+    /*@IgnoreAuth
     @GetMapping("info")
     public Object info(String mobile) {
         Map param = new HashMap();
@@ -47,7 +47,7 @@ public class ApiUserController extends ApiBaseAction {
         UserVo user = userService.queryByMobile(mobile);
         user.setPassword("");
         return user;
-    }
+    }*/
 
     /**
      * 发送短信
@@ -81,6 +81,8 @@ public class ApiUserController extends ApiBaseAction {
                 smsLog.setSendStatus(1);
                 smsLog.setSendId(vo.getSid());
                 smsLog.setReturnMsg(vo.getMsg());
+                smsLog.setMerchSn(getMerchSn());
+                smsLog.setStoreId(getStoreId().intValue());
 
                 SysSmsLogEntity sysSmsLogEntity = smsLogService.sendSms(smsLog);
                 if (null == sysSmsLogEntity) {

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

@@ -6,6 +6,8 @@ import org.apache.ibatis.annotations.Param;
 import com.kmall.common.dao.BaseDao;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 用户
  *
@@ -16,7 +18,7 @@ import org.springframework.stereotype.Component;
 @Component
 public interface ApiUserMapper extends BaseDao<UserVo> {
 
-    UserVo queryByMobile(String mobile);
+    List<UserVo> queryByMobile(String mobile);
 
     UserVo queryByOpenId(@Param("openId") String openId);
 

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

@@ -65,21 +65,21 @@ public class ApiUserService {
         userDao.deleteBatch(userIds);
     }
 
-    public UserVo queryByMobile(String mobile) {
+    public List<UserVo> queryByMobile(String mobile) {
         return userDao.queryByMobile(mobile);
     }
 
-    public long login(String mobile, String password) {
-        UserVo user = queryByMobile(mobile);
-        Assert.isNull(user, "手机号或密码错误");
-
-        //密码错误
-        if (!user.getPassword().equals(DigestUtils.sha256Hex(password))) {
-            throw new RRException("手机号或密码错误");
-        }
-
-        return user.getId();
-    }
+//    public long login(String mobile, String password) {
+//        UserVo user = queryByMobile(mobile);
+//        Assert.isNull(user, "手机号或密码错误");
+//
+//        //密码错误
+//        if (!user.getPassword().equals(DigestUtils.sha256Hex(password))) {
+//            throw new RRException("手机号或密码错误");
+//        }
+//
+//        return user.getId();
+//    }
 
     public SmsLogVo querySmsCodeByUserId(Long user_id) {
         return userDao.querySmsCodeByUserId(user_id);

kmall-api/src/main/java/com/kmall/api/util/ApiUserUtils.java

@@ -1,6 +1,7 @@
 package com.kmall.api.util;
 
 import com.kmall.api.service.pay.wxpay.WxPayPropertiesBuilder;
+import com.kmall.common.service.pay.global.CommonWxGlobalPayPropertiesBuilder;
 
 /**
  * 作者: @author Scott <br>
@@ -11,25 +12,30 @@ public class ApiUserUtils {
 
     //替换字符串
     public static String getCode(String APPID, String REDIRECT_URI, String SCOPE) {
-        //return String.format(ResourceUtil.getConfigByName("wx.getCode"), APPID, REDIRECT_URI, SCOPE);
         return String.format(WxPayPropertiesBuilder.instance().getGetCode(), APPID, REDIRECT_URI, SCOPE);
+//        return String.format(CommonWxGlobalPayPropertiesBuilder.instance().getGetCode(), APPID, REDIRECT_URI, SCOPE);
     }
 
     //替换字符串
     public static String getWebAccess(String CODE) {
         return String.format(
-                //ResourceUtil.getConfigByName("wx.webAccessTokenhttps"),
                 WxPayPropertiesBuilder.instance().getWebAccessTokenhttps(),
-                //ResourceUtil.getConfigByName("wx.appId"),
                 WxPayPropertiesBuilder.instance().getAppId(),
-                //ResourceUtil.getConfigByName("wx.secret"),
                 WxPayPropertiesBuilder.instance().getSecret(),
                 CODE);
+//        return String.format(
+//                //ResourceUtil.getConfigByName("wx.webAccessTokenhttps"),
+//                CommonWxGlobalPayPropertiesBuilder.instance().getWebAccessTokenhttps(),
+//                //ResourceUtil.getConfigByName("wx.appId"),
+//                CommonWxGlobalPayPropertiesBuilder.instance().getAppId(),
+//                //ResourceUtil.getConfigByName("wx.secret"),
+//                CommonWxGlobalPayPropertiesBuilder.instance().getSecret(),
+//                CODE);
     }
 
     //替换字符串
     public static String getUserMessage(String access_token, String openid) {
-        //return String.format(ResourceUtil.getConfigByName("wx.userMessage"), access_token, openid);
         return String.format(WxPayPropertiesBuilder.instance().getUserMessage(), access_token, openid);
+//        return String.format(CommonWxGlobalPayPropertiesBuilder.instance().getUserMessage(), access_token, openid);
     }
 }

kmall-api/src/main/java/com/kmall/api/util/CommonUtil.java

@@ -92,7 +92,8 @@ public class CommonUtil {
         Calendar cal = Calendar.getInstance();
         cal.setTime(new Date());
         String timeStr = DateUtils.format(cal.getTime(), DateUtils.DATE_TIME_PATTERN_YYYY_MM_DD);
-        return timeStr + CharUtil.getRandomNum(4);
+//        return timeStr + CharUtil.getRandomNum(6);
+        return CharUtil.getRandomNum(8);
     }
 
     public static String getSha1(String str) {

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

@@ -38,6 +38,12 @@
         from mall_user
         where id = #{id}
     </select>
+    <select id="queryByMobile" resultMap="BaseResultMap" >
+        select
+        <include refid="Base_Column_List" />
+        from mall_user
+        where mobile = #{mobile}
+    </select>
 
     <select id="queryObjectByIdNoAndName" resultMap="BaseResultMap" >
         select

kmall-common/src/main/java/com/kmall/common/utils/wechat/WechatConfig.java

@@ -1,5 +1,6 @@
 package com.kmall.common.utils.wechat;
 
+import com.kmall.common.service.pay.global.CommonWxGlobalPayPropertiesBuilder;
 import com.kmall.common.service.pay.wxpay.CommonWxPayPropertiesBuilder;
 import com.kmall.common.utils.ResourceUtil;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
@@ -26,15 +27,16 @@ public class WechatConfig {
         try {
             KeyStore keyStore = KeyStore.getInstance("PKCS12");
             Thread.currentThread().getContextClassLoader();
-//            InputStream instream = new WechatRefundApiResult().getClass().getResourceAsStream(
-//                    CommonWxPayPropertiesBuilder.instance().getCertName());
             InputStream instream = new FileInputStream(CommonWxPayPropertiesBuilder.instance().getCertName());
+//            InputStream instream = new FileInputStream(CommonWxGlobalPayPropertiesBuilder.instance().getCertName());
             try {
                 keyStore.load(instream, CommonWxPayPropertiesBuilder.instance().getMchId().toCharArray());
+//                keyStore.load(instream, CommonWxGlobalPayPropertiesBuilder.instance().getMchId().toCharArray());
             } finally {
                 instream.close();
             }
             SSLContext sslcontext = SSLContexts.custom().loadKeyMaterial(keyStore, CommonWxPayPropertiesBuilder.instance().getMchId().toCharArray()).build();
+//            SSLContext sslcontext = SSLContexts.custom().loadKeyMaterial(keyStore, CommonWxGlobalPayPropertiesBuilder.instance().getMchId().toCharArray()).build();
             sslcsf = new SSLConnectionSocketFactory(sslcontext, new String[]{"TLSv1"}, null, SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
         } catch (Exception e) {
             e.printStackTrace();

kmall-common/src/main/java/com/kmall/common/utils/wechat/wxglobal/WechatGlobalUtil.java

@@ -109,11 +109,12 @@ public class WechatGlobalUtil {
         param.put("mch_id", CommonWxGlobalPayPropertiesBuilder.instance().getMchId());// 商家账号
         String randomStr = CharUtil.getRandomNum(18).toUpperCase();
         param.put("nonce_str", randomStr);// 随机字符串
-        if(StringUtils.isNotEmpty(body)) {
-            param.put("body", body);// 商品描述
-        }else{
-            param.put("body", "商城-支付");// 商品描述
-        }
+//        if(StringUtils.isNotEmpty(body)) {
+//            param.put("body", body);// 商品描述
+//        }else{
+//            param.put("body", "中网跨境商城-支付");// 商品描述
+//        }
+        param.put("body", "中网跨境商城-支付");// 商品描述
         param.put("out_trade_no", out_trade_no);// 商户订单编号
         //支付金额
         param.put("total_fee", Math.round(actual_price.multiply(Constant.ONE_HUNDRED).doubleValue()));// 消费金额

kmall-schedule/src/main/resources/mybatis/mapper/QzOrderMapper.xml

@@ -133,9 +133,9 @@
         and shipping_status ='1' and a.order_biz_type in(10,02) AND r.customs_succ_time <![CDATA[ <  ]]>  DATE_ADD(now(),INTERVAL -7 DAY)  AND a.is_onffline_order = 0
     </select>
     <select id="queryShipmentBondedOrderList" resultType="map">
-        SELECT a.order_sn,a.order_status,a.pay_status,a.id 'orderId',a.merch_order_sn,date_format(r.shipment_succ_time,'%Y-%m-%d %H:%i:%s') as shipment_succ_time
+        SELECT a.order_sn,a.order_status,a.pay_status,a.id 'orderId',a.merch_order_sn,date_format(r.shipment_start_time,'%Y-%m-%d %H:%i:%s') as shipment_start_time
         FROM `mall_order` a inner join mall_order_process_record r on a.order_sn=r.order_sn where order_status='300' and shipping_status ='1'
-        and a.order_biz_type in(00,11) AND r.shipment_succ_time <![CDATA[ <  ]]>  DATE_ADD(now(),INTERVAL -7 DAY)  AND a.is_onffline_order = 0
+        and a.order_biz_type in(00,11) AND r.shipment_start_time <![CDATA[ <  ]]>  DATE_ADD(now(),INTERVAL -7 DAY)  AND a.is_onffline_order = 0
     </select>
 
     <update id="updateShipmentOrder" parameterType="map">

wx-mall/pages/auth/newuser/newuser.js

@@ -57,13 +57,8 @@ Page({
           title: '手机号绑定成功'
         });
         wx.redirectTo({ url: '/pages/ucenter/coupon/coupon' });
-      } else if (res.errno === 1) {
+      } else {
         util.showErrorToast(res.errmsg);
-        // wx.showModal({
-        //   title: '提示信息',
-        //   content: res.errmsg,
-        //   showCancel: false
-        // });
       }
     });
   },

wx-mall/pages/catalog/catalog.js

@@ -60,16 +60,25 @@ Page({
   getCatalog: function () {
     //CatalogList
     let that = this;
-    util.request(api.CatalogList).then(function (res) {
-      if (that.data.currentCategory && that.data.currentCategory.id > 0) {
-        that.setData({
-          navList: res.data.categoryList,
-        });
-      } else {
+    
+    util.request(api.CatalogList).then(function (res) { 
+      if (!wx.getStorageSync('currentCategory')) {
         that.setData({
           navList: res.data.categoryList,
           currentCategory: res.data.currentCategory
         });
+        wx.setStorageSync('currentCategory', res.data.currentCategory);
+      } else {
+        if (that.data.currentCategory && that.data.currentCategory.id > 0) {
+          that.setData({
+            navList: res.data.categoryList
+          });
+        } else {
+          that.setData({
+            navList: res.data.categoryList,
+            currentCategory: res.data.currentCategory
+          });
+        }
       }
       that.getCategoryData();
     });
@@ -86,6 +95,7 @@ Page({
         that.setData({
           currentCategory: res.data.currentCategory
         });
+        console.log(that.data.currentCategory);
         that.getGoodsList();
       });
   },

wx-mall/pages/goods/goods.js

@@ -76,7 +76,6 @@ Page({
           defaultFreight: res.data.defaultFreight,
           checkedSpecText: res.data.specificationList[0].valueList[0].value
         });
-        wx.hideLoading();
 
         if (res.data.userHasCollect == 1) {
           that.setData({
@@ -105,7 +104,8 @@ Page({
         that.setData({
           'specificationList': _specificationList
         });
-      }
+        }
+        wx.hideLoading();
     });
     if (null != that.data.referrer && that.data.referrer > 0) {
       util.request(api.GoodsTransferCoupon, {

wx-mall/pages/map/map.js

@@ -112,7 +112,11 @@ Page({
     let that = this;
     util.request(api.ChooseStoreId, { storeId: storeId, merchSn: merchSn }, 'POST').then(function (res) {
       if (res.errno === 0) {
+        wx.removeStorageSync('nearStoreList');
+        wx.removeStorageSync('storeId');
+        wx.removeStorageSync('storeVo');
         wx.setStorageSync('storeId', storeId);
+        wx.removeStorageSync('currentCategory');
         var item = "";
         for (var i = 0; i < that.data.nearStoreList.length; i++) {
           if (storeId == that.data.nearStoreList[i].id) {
@@ -122,9 +126,9 @@ Page({
           }
         }
 
-        var pages = getCurrentPages();
-        var currPage = pages[pages.length - 1];  //当前页面
-        var prevPage = pages[pages.length - 2]; //上一个页面
+        // var pages = getCurrentPages();
+        // var currPage = pages[pages.length - 1];  //当前页面
+        // var prevPage = pages[pages.length - 2]; //上一个页面
         if (item == "") {
           wx.removeStorageSync('nearStoreList');
           wx.removeStorageSync('storeId');
@@ -134,15 +138,18 @@ Page({
           })
         } else {
           //直接调用上一个页面的setData()方法，把数据存到上一个页面中去
-          prevPage.setData({
+          that.setData({
             storeName: item.storeName
           })
         }
+        wx.switchTab({
+          url: '/pages/index/index'
+        });
 
-        prevPage.getIndexData();
-        prevPage.enableActivity();
-        prevPage.getGroupData();
-        wx.navigateBack()
+        // prevPage.getIndexData();
+        // prevPage.enableActivity();
+        // prevPage.getGroupData();
+        // wx.navigateBack()
       }
     })
   }

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

@@ -164,10 +164,10 @@ Page({
           goodsTotalByType02: num02,
           goodsTotalByType10: num10,
           goodsTotalByType11: num11,
-          goodsTotalPrice00: goodsTotalPrice00 + that.data.freightPrice00,
-          goodsTotalPrice02: goodsTotalPrice02 + that.data.freightPrice02,
-          goodsTotalPrice10: goodsTotalPrice10 + that.data.freightPrice10,
-          goodsTotalPrice11: goodsTotalPrice11 + that.data.freightPrice11
+          goodsTotalPrice00: (goodsTotalPrice00 + that.data.freightPrice00).toFixed(2),
+          goodsTotalPrice02: (goodsTotalPrice02 + that.data.freightPrice02).toFixed(2),
+          goodsTotalPrice10: (goodsTotalPrice10 + that.data.freightPrice10).toFixed(2),
+          goodsTotalPrice11: (goodsTotalPrice11 + that.data.freightPrice11).toFixed(2)
         });
         // console.log(that.data.goodsTotalByType00);
         // console.log(that.data.goodsTotalByType02);
@@ -301,7 +301,6 @@ Page({
         for (let i = 0; i < res.data.orderInfo.length; i++){
           orderIds[i] = res.data.orderInfo[i].id;
         }
-        wx.hideLoading();
         wx.redirectTo({
           url: '/pages/pay/pay?orderIds=' + orderIds + '&actualPrice=' + actualPrice + '&isMergePay=1'//此处提交支付属于合并支付
         })
@@ -313,6 +312,7 @@ Page({
           showCancel: false
         });
       }
+      wx.hideLoading();
     });
   },
   // 校验门店