Merge branch 'mall_dev_7.10.0-demolition-order' into 'mall_dev_7.11.0'

优化富文本显示问题

See merge request !190

src/component/html2wxml/wxHtml.wxss

@@ -4,7 +4,8 @@
   width:100%;
 }
 .wxParser {
-  margin:-20rpx 0;
+  /* margin:-20rpx 0; */
+  margin: 0;
 }
 
 /* .wxParser .wxParser-p{

src/component/personCenter/personCenter.js

@@ -109,7 +109,9 @@ Component({
     },
     //获取等级列表
     getLevelList(){
-      wxService.get('/member/memberLevel/get').then(res => {
+      // /member/memberLevel/get
+      // wxService.get('/member/memberLevel/get').then(res => {
+        wxService.post('/merchant/settingLevel/get').then(res => {
         if(res){
           let levelList = res.data.data ? res.data.data  : [];
           if (levelList.length == 0){

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 = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
 //仅生产环境时 配置 ： 
 //3001 3001 ,  wx313ec36b710125d4 有直播
 //2006 泰华 , wx40fec8944623c8b3 有直播
@@ -25,7 +25,7 @@ const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门
 //2992 山东盛联微商城 wx53dedc202ae0d0c2
 //2002 巴黎贝甜 wx21968cb3a486d4ab
 
-const BRANCH_ID = 1002
+const BRANCH_ID = 2010
 const isMall = true
 
 // const needMock = '' //

src/pages/wantToBuyDetail/wantToBuyDetail.wxss

@@ -94,6 +94,7 @@ swiper {
 }
 .buy-product-wrap{
   padding: 0 20rpx;
+  margin-top: 50rpx;
 }
 
 .buy-product-content{

src/project.config.json

@@ -13,7 +13,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",
-	"appid": "wxac09792264c49b5c",
+	"appid": "wxe6d270a3e399ade9",
 	"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
 	"debugOptions": {
 		"hidedInDevtools": []
@@ -244,8 +244,8 @@
 					"scene": null
 				},
 				{
-					"id": -1,
-					"name": "种草社区",
+					"id": 30,
+					"name": "会员发布种草",
 					"pathName": "subPackage/page/pages/grassCommunity/grassCommunity",
 					"query": "",
 					"scene": null
@@ -635,6 +635,7 @@
 					"id": -1,
 					"name": "刮刮卡",
 					"pathName": "subPackageMarketing/page/pages/scratch/scratch",
+					"query": "",
 					"scene": null
 				}
 			]

src/shoppingGuid/page/pages/guidCollegeInfo/guidCollegeInfo.wxss

@@ -3,7 +3,7 @@ page{
   background: #ffffff;
   box-sizing: border-box;
   -webkit-box-sizing: border-box;
-  padding-bottom: 30rpx;
+  /* padding-bottom: 30rpx; */
   font-size: 28rpx;
   color: #333333;
 }