Commit 1b613d11 by 谢中龙

优化富文本显示问题

parent 69c048fb
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
width:100%; width:100%;
} }
.wxParser { .wxParser {
margin:-20rpx 0; /* margin:-20rpx 0; */
margin: 0;
} }
/* .wxParser .wxParser-p{ /* .wxParser .wxParser-p{
......
...@@ -109,7 +109,9 @@ Component({ ...@@ -109,7 +109,9 @@ Component({
}, },
//获取等级列表 //获取等级列表
getLevelList(){ 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){ if(res){
let levelList = res.data.data ? res.data.data : []; let levelList = res.data.data ? res.data.data : [];
if (levelList.length == 0){ if (levelList.length == 0){
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
// 修改 BRANCH_ID 为对应的商户id // 修改 BRANCH_ID 为对应的商户id
// app.js 中brandId 修改为对应 // 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 有直播 //3001 3001 , wx313ec36b710125d4 有直播
//2006 泰华 , wx40fec8944623c8b3 有直播 //2006 泰华 , wx40fec8944623c8b3 有直播
...@@ -25,7 +25,7 @@ const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门 ...@@ -25,7 +25,7 @@ const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门
//2992 山东盛联微商城 wx53dedc202ae0d0c2 //2992 山东盛联微商城 wx53dedc202ae0d0c2
//2002 巴黎贝甜 wx21968cb3a486d4ab //2002 巴黎贝甜 wx21968cb3a486d4ab
const BRANCH_ID = 1002 const BRANCH_ID = 2010
const isMall = true const isMall = true
// const needMock = '' // // const needMock = '' //
......
...@@ -94,6 +94,7 @@ swiper { ...@@ -94,6 +94,7 @@ swiper {
} }
.buy-product-wrap{ .buy-product-wrap{
padding: 0 20rpx; padding: 0 20rpx;
margin-top: 50rpx;
} }
.buy-product-content{ .buy-product-content{
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.8.2", "libVersion": "2.8.2",
"appid": "wxac09792264c49b5c", "appid": "wxe6d270a3e399ade9",
"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E", "projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
"debugOptions": { "debugOptions": {
"hidedInDevtools": [] "hidedInDevtools": []
...@@ -244,8 +244,8 @@ ...@@ -244,8 +244,8 @@
"scene": null "scene": null
}, },
{ {
"id": -1, "id": 30,
"name": "种草社区", "name": "会员发布种草",
"pathName": "subPackage/page/pages/grassCommunity/grassCommunity", "pathName": "subPackage/page/pages/grassCommunity/grassCommunity",
"query": "", "query": "",
"scene": null "scene": null
...@@ -635,6 +635,7 @@ ...@@ -635,6 +635,7 @@
"id": -1, "id": -1,
"name": "刮刮卡", "name": "刮刮卡",
"pathName": "subPackageMarketing/page/pages/scratch/scratch", "pathName": "subPackageMarketing/page/pages/scratch/scratch",
"query": "",
"scene": null "scene": null
} }
] ]
......
...@@ -3,7 +3,7 @@ page{ ...@@ -3,7 +3,7 @@ page{
background: #ffffff; background: #ffffff;
box-sizing: border-box; box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
padding-bottom: 30rpx; /* padding-bottom: 30rpx; */
font-size: 28rpx; font-size: 28rpx;
color: #333333; color: #333333;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment