Merge branch 'mall_dev_7.11.0' into 'mall_dev_7.12.0'

Mall dev 7.11.0

See merge request !198

src/config/index.js

@@ -6,7 +6,7 @@
 // 修改 BRANCH_ID 为对应的商户id
 // app.js 中brandId 修改为对应
 
-const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
+const PROJECT_ENV = 'dev' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
 //仅生产环境时 配置 ： 
 //3001 3001 ,  wx313ec36b710125d4 有直播
 //2006 泰华 , wx40fec8944623c8b3 有直播
@@ -24,8 +24,9 @@ const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门
 //2017 ACTREE wx2aae34874e88cdf5
 //2992 山东盛联微商城 wx53dedc202ae0d0c2
 //2002 巴黎贝甜 wx21968cb3a486d4ab
+//2014 包小姐与鞋先生 wxa00302e2f53dd9c5
 
-const BRANCH_ID = 1002
+const BRANCH_ID = 1001
 const isMall = true
 
 // const needMock = '' //
@@ -407,7 +408,30 @@ const prod_brand_config = {
     // "wxa006e9b0a0ee1bfe", 外卖
     // "wx39b5d8891f375d1c" 礼品卡
   },
- 
+  //包小姐与鞋先生
+  2014 : {
+    appId: 'wxa00302e2f53dd9c5',
+    tunnelToken: 'd1637a225cfe0f61a72967a74a872a7f',
+    brandId: 2014,
+    plusIsOpen: false,
+    contactUsIsOpen: false,
+    contactUsPluginId: '',
+    hasTrial: false,
+    isMall: isMall,
+    canUseWechatAddress: false,//是否使用获取微信地址
+    touchPointStorageTime: 30 * 60 * 1000,//单位毫秒
+    orderingMustOpenCard: false,
+    canRefundDaysAfterDelivery: 15,//发货后多少天之内可显示申请退款按钮
+    isOpenSelfMention: false, // 是否开启门店自提
+    hasLiveVideo : false,//是否有直播功能
+    guiderCanScanQrcode: true,//导购是否有扫一扫功能
+    isNeedGetLocation: false,//是否开启小程序获取位置（提交订单时获取门店信息）
+    shareTitle: '【MS.BAG&MR.SHOE】',
+    logo: 'https://img3.bigaka.com/prd/3001/202004/20200428/3001b3138e96-bb20-4492-916b-d9540cf072a7.jpg',
+    openRefundTips : false,//是否开启退货须知显示
+    refundTips : '',//退货须知文本 
+  }
+  
 }
 
 //默认分享logo

src/pages/category/category.wxss

@@ -11,8 +11,7 @@ page {
 .nav-menu {
   flex: 0;
   width: 25%;
-  padding-bottom: 50px;
-  border-right: solid 1rpx #dddddd;
+  padding-bottom: 20px;
 }
 
 .nav-menu .menu-item {
@@ -167,4 +166,4 @@ page {
   width: 18rpx;
   height: 24rpx;
   margin-left: 10rpx;
-}
\ No newline at end of file
+}

src/pages/confirmOrder/confirmOrder.js

@@ -53,6 +53,7 @@ wxService.page({
     },
     orderStoreInfo: null,
     couponDiscountPreviews: [],
+    coouponDiscount : 0,
     //积分抵扣
     pointDeductOpen : true,//是否开启积分抵扣
     deductCheckStatus : false,//是否勾选使用积分抵扣
@@ -370,15 +371,16 @@ wxService.page({
       orderInitPrice,
       isSelect,
       plusMemberPrice,
-      defalutCoupon
+      defalutCoupon,
+      coouponDiscount
     } = this.data;
-    
     let newCurrentCoupon = currentCoupon ? currentCoupon : 0
     let orderCoupon = parseFloat(newCurrentCoupon) // 优惠券价格
     let plusPrice = isSelect ? plusMemberPrice : 0 // plus
     let calCouponPrice = orderCoupon ? orderCoupon : defalutCoupon
+
     //获取计算优惠后的价格
-    let promotionPrice = (orderInitPrice - calCouponPrice) > 0 ? (orderInitPrice - calCouponPrice) : 0;
+    let promotionPrice = (orderInitPrice - coouponDiscount) > 0 ? (orderInitPrice - coouponDiscount) : 0;
     //看一下积分是否勾选了
     if(this.data.deductCheckStatus){
       promotionPrice = promotionPrice*1 - this.data.pointDeductMoney*1;
@@ -731,6 +733,7 @@ wxService.page({
           }
 
           this.data.pointPayInfo = data.pointPayInfo;
+          this.data.coouponDiscount = data.coouponDiscount;
 
           //如果没有couponId则认为是第一次进来没有自己选择优惠券
           if (!this.data.couponId) {
@@ -761,7 +764,8 @@ wxService.page({
                 totalGoodsPrice: this.data.totalGoodsPrice,
                 avaliablePoint : this.data.avaliablePoint,
                 pointDeductMoney : this.data.pointDeductMoney,
-                deductCheckStatus : this.data.deductCheckStatus
+                deductCheckStatus : this.data.deductCheckStatus,
+                coouponDiscount : this.data.coouponDiscount,
               }, () => {
                 // 实付款
                 this.setPayPrice()
@@ -775,7 +779,8 @@ wxService.page({
                 totalGoodsPrice: this.data.totalGoodsPrice,
                 avaliablePoint : this.data.avaliablePoint,
                 pointDeductMoney : this.data.pointDeductMoney,
-                deductCheckStatus : this.data.deductCheckStatus
+                deductCheckStatus : this.data.deductCheckStatus,
+                coouponDiscount : this.data.coouponDiscount,
               }, () => {
                 // 实付款
                 this.setPayPrice()
@@ -792,7 +797,8 @@ wxService.page({
               totalGoodsPrice: this.data.totalGoodsPrice,
               avaliablePoint : this.data.avaliablePoint,
               pointDeductMoney : this.data.pointDeductMoney,
-              deductCheckStatus : this.data.deductCheckStatus
+              deductCheckStatus : this.data.deductCheckStatus,
+              coouponDiscount : this.data.coouponDiscount,
             }, () => {
               // 实付款
               this.setPayPrice()

src/pages/confirmOrder/confirmOrder.wxml

@@ -163,7 +163,11 @@
           <view bindtap="selectCoupon">
             <text class="price-label">优惠券</text>
             <view class="select-coupon">
-              <text class="{{defalutCoupon ? 'coupon-price' : 'no-coupon'}}">{{defalutCoupon ? (currentCoupon ? '-' + currentCoupon : '-' + defalutCoupon): (currentOrderList.couponDiscountPreviews.length == 0 ? '无可使用优惠券' : '选择优惠券')}}</text>
+            <!-- coouponDiscount -->
+              <text class="{{defalutCoupon ? 'coupon-price' : 'no-coupon'}}">{{
+                currentOrderList.couponDiscountPreviews.length == 0 ? '无可使用优惠券' : (
+                  coouponDiscount ? '-' + coouponDiscount : '选择优惠券'
+                )}}</text>
               <image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png" />
             </view>
           </view>

src/project.config.json

@@ -13,7 +13,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",
-	"appid": "wxac09792264c49b5c",
+	"appid": "wxc3b64b09b1d3dfc2",
 	"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
 	"debugOptions": {
 		"hidedInDevtools": []