Merge branch 'mall_dev_7.13.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into mall_dev_7.13.0

src/component/plus/plus.wxml

@@ -7,8 +7,7 @@
 		 wx:for="{{skuVOList}}"
 		 wx:for-index="idx"
 		 wx:for-item="navItem"
-		 wx:key="idx"
-		>
+		 wx:key="idx">
 			<view
 			 class="scroll-view-item {{currentTab == idx ?'poster-active':''}}"
 			 data-current="{{idx}}"
@@ -19,8 +18,7 @@
        data-price="{{navItem.price}}"
 			 bindtap="switchNav"
 			 style="{{currentTab == idx ? 'background-image: url('+ plusBgi.activeUrl +');' : 'background-image: url('+ plusBgi.inactiveUrl +');'}}"
-       wx:if="{{navItem.valid}}"
-			>
+       wx:if="{{navItem.valid}}">
 				<view class="plus-choose">
           <text wx:if="{{navItem.duration == 365}}">每月仅￥{{utils.numberFormat(navItem.price / 12)}}</text>
 				  <text wx:else>每月仅￥{{utils.numberFormat(navItem.price / navItem.duration * 30)}}</text>

src/component/plus/plus.wxss

@@ -6,11 +6,12 @@
   width: 100%;
   display: flex;
   white-space: nowrap;
+  /* box-sizing: border-box; */
   box-sizing: border-box;
   height:  226rpx;
   position: fixed;
   bottom: 88rpx;
-  padding: 36rpx 0 36rpx 30rpx;
+  padding: 30rpx;
   /* background-color: rgba(192, 154, 116, 0.2); */
   /* background-color: rgb(230,215,199); */
   /* background: #ffffff; */
@@ -20,6 +21,7 @@
 
 .scroll-view_H {
   width: 100%;
+  text-align: center;
 }
 .scroll-view-item {
   display: inline-block;

src/config/index.js

@@ -12,6 +12,7 @@ const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门
 //2006 泰华 , wx40fec8944623c8b3 有直播 //门户 wx833d5ece112fc3fd
 //2007 多多一上 , wxf7bc302c51166dc0 有直播
 //2012 悦芙媞  wxfe14ebde4a6eea3d 有直播
+//2021 柏草日记 wx0eb4c0bc80001e25
 
 //2008 雪岛书屋  wx207f8a95bbc9d3ab
 //2003 苏州邻里 , wxe7770946f9d93d38
@@ -462,7 +463,31 @@ const prod_brand_config = {
     openRefundTips : false,//是否开启退货须知显示
     refundTips : '',//退货须知文本 
     signUrl : 'https://crm-m.bigaka.com/activity/sign.html?brandId=3001',
-  }
+  },
+  //2021 柏草日记
+  2021: {
+    appId: 'wx0eb4c0bc80001e25',
+    tunnelToken: 'e7d05514b45056ee26fe04ca2c973cbf',
+    brandId: 2021,
+    plusIsOpen: true,
+    contactUsIsOpen: true,
+    contactUsPluginId: '9d6a0dcac678be7a750494cd66cf6441',
+    hasTrial: false,
+    isMall: isMall,
+    canUseWechatAddress: false,//是否使用获取微信地址
+    touchPointStorageTime: 30 * 60 * 1000,//单位毫秒
+    orderingMustOpenCard: true,
+    canRefundDaysAfterDelivery: 15,//发货后多少天之内可显示申请退款按钮
+    isOpenSelfMention: true, // 是否开启门店自提
+    hasLiveVideo: false,//是否有直播功能
+    guiderCanScanQrcode: true,//导购是否有扫一扫功能
+    isNeedGetLocation: true,//是否开启小程序获取位置（提交订单时获取门店信息）
+    shareTitle: '【Beneplant柏草日记官方商城】',
+    logo: 'https://img3.bigaka.com/prd/3001/202005/20200513/3001e51a8eab-4c41-4b31-bc9f-6eb5c9a3890f.png',
+    openRefundTips: false,//是否开启退货须知显示
+    refundTips: '',//退货须知文本 
+    //要跳转的外部小程序appid
+  },
   
 }
 
@@ -471,8 +496,6 @@ const defaultShareLogo = 'https://img3.bigaka.com/prd/3001/202003/20200331/30018
 //推广商品页面banner 
 const speadProductsBanner = 'https://img3.bigaka.com/prd/3001/202003/20200331/30012d0886ca-a722-4f3a-ae64-ca2ffd3651a5.jpg';
 
-
-
 // 开启联系我时 app.json plugin中添加此代码
 // "contactPlugin": {
 //   "version": "1.0.12",

src/project.config.json

@@ -141,7 +141,7 @@
 					"id": 13,
 					"name": "subPage",
 					"pathName": "subPackage/page/pages/subPage/subPage",
-					"query": "pageId=106&t=cKG2AoWZ00",
+					"query": "pageId=73",
 					"scene": null
 				},
 				{