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

README.md

@@ -64,7 +64,7 @@ kmall-pt
 * 将wx-mall导入微信web开发者工具
 
 * 生成环境打包 
-    * mvn clean
+    * mvn clean package
     * mvn package -P prod
     
 ## 打印机设置

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

@@ -80,6 +80,7 @@ public class StoreController {
         builder.put("storeNumber", "门店编号");
         builder.put("thirdPartyMerchCode", "第三方商户编号");
         builder.put("thirdPartyMerchName", "第三方商户名称");
+        builder.put("exprAgreementType", "第三方商户快递协议类型");
         builder.put("latitude", "纬度");
         builder.put("longitude", "经度");
         R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
@@ -109,6 +110,7 @@ public class StoreController {
         builder.put("storeNumber", "门店编号");
         builder.put("thirdPartyMerchCode", "第三方商户编号");
         builder.put("thirdPartyMerchName", "第三方商户名称");
+        builder.put("exprAgreementType", "第三方商户快递协议类型");
         builder.put("latitude", "纬度");
         builder.put("longitude", "经度");
         R r = ValidatorUtil.isEmpty(builder.build(), valideDate);

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

@@ -76,6 +76,15 @@ public class StoreEntity implements Serializable {
 
     private String thirdPartyMerchCode;
     private String thirdPartyMerchName;
+    private String exprAgreementType;
+
+    public String getExprAgreementType() {
+        return exprAgreementType;
+    }
+
+    public void setExprAgreementType(String exprAgreementType) {
+        this.exprAgreementType = exprAgreementType;
+    }
 
     public String getThirdPartyMerchCode() {
         return thirdPartyMerchCode;

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

@@ -25,6 +25,7 @@
 
 		<result property="thirdPartyMerchCode" column="third_party_merch_code"/>
 		<result property="thirdPartyMerchName" column="third_party_merch_name"/>
+		<result property="exprAgreementType" column="expr_agreement_type"/>
     </resultMap>
 
 	<select id="queryObject" resultType="com.kmall.admin.entity.StoreEntity">
@@ -40,7 +41,7 @@
 			`county_name`,
 			`latitude`,
 			`longitude`,
-			`cover_radius`,
+			`cover_radius`,expr_agreement_type,
 			`remark`,merch_sn, merch_name, creater_sn, create_time,third_party_merch_code,third_party_merch_name,
 		moder_sn, mod_time, tstm
 		from mall_store
@@ -60,7 +61,7 @@
 		`county_name`,
 		`latitude`,
 		`longitude`,
-		`cover_radius`,
+		`cover_radius`,expr_agreement_type,
 		`remark`,merch_sn, merch_name, creater_sn, create_time,third_party_merch_code,third_party_merch_name,
     moder_sn, mod_time, tstm
 		from mall_store
@@ -81,7 +82,7 @@
     		`latitude`,
     		`longitude`,
     		`cover_radius`,
-    		`remark`,merch_sn, merch_name, creater_sn, create_time,third_party_merch_code,third_party_merch_name,
+    		`remark`,merch_sn, merch_name, creater_sn, create_time,third_party_merch_code,third_party_merch_name,expr_agreement_type,
 		moder_sn, mod_time, tstm
 		from mall_store
 		WHERE 1=1
@@ -126,7 +127,7 @@
 			AND id = #{id}
 		</if>
 	</select>
-	 
+
 	<insert id="save" parameterType="com.kmall.admin.entity.StoreEntity" useGeneratedKeys="true" keyProperty="id">
 		insert into mall_store(
 			`merch_sn`,
@@ -143,6 +144,7 @@
 			`remark`,
 			third_party_merch_code,
 			third_party_merch_name,
+			expr_agreement_type,
 			creater_sn,
 			create_time,
 			moder_sn,
@@ -163,6 +165,7 @@
 			#{remark},
 			#{thirdPartyMerchCode},
 			#{thirdPartyMerchName},
+			#{exprAgreementType},
 			#{createrSn},
 			#{createTime},
 			#{moderSn},
@@ -189,6 +192,7 @@
 			<if test="createTime != null" >create_time = #{createTime},</if>
 			<if test="thirdPartyMerchCode != null" >third_party_merch_code = #{thirdPartyMerchCode},</if>
 			<if test="thirdPartyMerchName != null" >third_party_merch_name = #{thirdPartyMerchName},</if>
+			<if test="exprAgreementType != null" >expr_agreement_type = #{exprAgreementType},</if>
 			<if test="moderSn != null" >moder_sn = #{moderSn},</if>
 			<if test="modTime != null" >mod_time = #{modTime},</if>
 			<if test="tstm != null" >tstm = #{tstm},</if>

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

@@ -54,6 +54,17 @@
             <Form-item label="第三方商户名称" prop="thirdPartyMerchName">
                 <i-input v-model="store.thirdPartyMerchName" placeholder="第三方商户名称"/>
             </Form-item>
+            <Form-item label="第三方商户快递协议类型" prop="exprAgreementType">
+                <Radio-group v-model="store.exprAgreementType">
+                    <Radio label="00">
+                        <span>e码头</span>
+                    </Radio>
+                    <Radio label="01">
+                        <span>商户自谈</span>
+                    </Radio>
+                </Radio-group>
+            </Form-item>
+
             <Form-item label="门店地址" prop="storeAddress">
                 <i-input v-model="store.storeAddress" placeholder="门店地址"/>
             </Form-item>

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

@@ -77,7 +77,7 @@ let vm = new Vue({
         add: function () {
             vm.showList = false;
             vm.title = "新增";
-            vm.store = {};
+            vm.store = {exprAgreementType:'00'};
             vm.merchList = [];
             vm.getMerchList();
         },

wx-mall/pages/activity/activity.json

@@ -1 +1,3 @@
-{}
+{
+  "navigationBarTitleText": "活动"
+}

wx-mall/pages/auth/login/login.json

@@ -1 +1,3 @@
-{}
+{
+  "navigationBarTitleText": "登录"
+}

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

@@ -1 +1,3 @@
-{}
+{
+  "navigationBarTitleText": "注册"
+}

wx-mall/pages/brand/brand.json

@@ -1 +1,3 @@
-{}
+{
+  "navigationBarTitleText": "品牌"
+}

wx-mall/pages/catalog/catalog.json

@@ -1 +1,3 @@
-{}
+{
+  "navigationBarTitleText": "分类"
+}

wx-mall/pages/category/category.json

@@ -1,3 +1,4 @@
 {
-  "onReachBottomDistance": 450
+  "onReachBottomDistance": 450,
+  "navigationBarTitleText": "分类"
 }

wx-mall/pages/comment/comment.json

@@ -1,3 +1,3 @@
 {
-
+  "navigationBarTitleText": "评论列表"
 }

wx-mall/pages/goods/goods.json

@@ -1 +1,3 @@
-{}
+{
+  "navigationBarTitleText": "商品详情"
+}

wx-mall/pages/goods/goods.wxml

@@ -115,8 +115,11 @@
             <text>{{brand.name}}</text>
           </navigator>
         </view> -->
+        <!-- <view class="brand">
+          <text>发货地：深圳前海保税仓</text>
+        </view> -->
         <view style='margin-top:20px;'>
-          <text class="desc">快递：{{defaultFreight==0?"免邮":"元"}}</text>
+          <text class="desc">快递：{{defaultFreight==0?"免邮":defaultFreight+"元"}}</text>
           <text class="desc2">销量：{{goods.sell_volume==null?0:goods.sell_volume}}</text>
         </view>
       </view>

wx-mall/pages/hotGoods/hotGoods.js

@@ -157,6 +157,11 @@ Page({
       openAttr: !this.data.openAttr
     })
   },
+  hideSwitchAttrPop: function () {
+    this.setData({
+      openAttr: false
+    })
+  },
   //购物车增加
   addCart: function (e) {
     let that = this;

wx-mall/pages/hotGoods/hotGoods.json

@@ -1,3 +1,3 @@
 {
-    
+  "navigationBarTitleText": "今日热销"
 }

wx-mall/pages/hotGoods/hotGoods.wxml

@@ -49,7 +49,7 @@
     </view>
     <view wx:if="{{showNavList}}" class="close" bindtap="toggleNav">X</view>
   </view>
-  <view class="brand-info">
+  <view class="brand-info" bindtap="hideSwitchAttrPop">
     <view class="name">
       <image class="img" src="{{bannerInfo.img_url}}"></image>
       <view class="info-box">
@@ -61,7 +61,7 @@
     </view>
   </view>
   <view class="sort">
-    <view class="sort-box">
+    <view class="sort-box" bindtap="hideSwitchAttrPop">
       <view class="item {{currentSortType == 'default' ? 'active' : ''}}" bindtap="openSortFilter" id="defaultSort">
         <text class="txt">综合</text>
       </view>
@@ -72,11 +72,11 @@
         <text class="txt">分类</text>
       </view>
     </view>
-    <view class="sort-box-category" wx-if="{{categoryFilter}}">
+    <view class="sort-box-category" wx-if="{{categoryFilter}}" bindtap="hideSwitchAttrPop">
       <view class="item {{item.checked ? 'active' : ''}}" wx:for="{{filterCategory}}" wx:key="cate-{{item.id}}" data-category-index="{{index}}" bindtap="selectCategory">{{item.name}}</view>
     </view>
   </view>
-  <view class="cate-item">
+  <view class="cate-item" bindtap="hideSwitchAttrPop">
     <view class="b">
       <block wx:for="{{goodsList}}" wx:for-index="iindex" wx:for-item="iitem" wx:key="unique">
         <view class="item {{iindex % 2 == 0 ? 'item-b' : '' }}">

wx-mall/pages/index/index.js

@@ -160,6 +160,7 @@ Page({
   // 同步门店
   syncStore: function () {
     let that = this;
+    console.log(wx.getStorageSync('merchSn'));
     //获取附件门店信息
     util.getLocation((lng, lat) => {
       wx.setStorageSync('location', JSON.stringify({ lng, lat }));

wx-mall/pages/search/search.json

@@ -1,3 +1,3 @@
 {
-    
+  "navigationBarTitleText": "商品搜索"
 }

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

@@ -1 +1,3 @@
-{}
+{
+  "navigationBarTitleText": "收货地址"
+}

wx-mall/pages/shopping/addressAdd/addressAdd.json

@@ -1,3 +1,3 @@
 {
-    
+  "navigationBarTitleText": "新增收货地址"
 }

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

@@ -1,3 +1,3 @@
 {
-    
+  "navigationBarTitleText": "确认订单"
 }

wx-mall/pages/shopping/coupon/coupon.json

@@ -1 +1,3 @@
-{}
+{
+  "navigationBarTitleText": "优惠券"
+}

wx-mall/pages/ucenter/address/address.json

@@ -1 +1,3 @@
-{}
+{
+  "navigationBarTitleText": "收货地址"
+}

wx-mall/pages/ucenter/addressAdd/addressAdd.json

@@ -1,3 +1,3 @@
 {
-    
+  "navigationBarTitleText": "新增收货地址"
 }

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

@@ -1,3 +1,3 @@
 {
-  
+  "navigationBarTitleText": "我的收藏"
 }

wx-mall/pages/ucenter/coupon/coupon.json

@@ -1,3 +1,3 @@
 {
-  
+  "navigationBarTitleText": "优惠券"
 }

wx-mall/pages/ucenter/feedback/feedback.json

@@ -1,3 +1,3 @@
 {
-  
+  "navigationBarTitleText": "意见反馈"
 }

wx-mall/pages/ucenter/footprint/footprint.json

@@ -1,3 +1,3 @@
 {
-  
+  "navigationBarTitleText": "我的足迹"
 }

wx-mall/pages/ucenter/share/share.json

@@ -1 +1,3 @@
-{}
+{
+  "navigationBarTitleText": "我的分享"
+}