提交

pages/microShop/index/index.vue

@@ -41,7 +41,7 @@
 				  <view class="title">{{pageTitle}}</view>
 				  <view class="arrow"></view>
 				</view>
-				<view class="applyCont">
+				<view class="applyCont" :style="{'margin-top':modelstype+'%'}">
 					<view class="applybox">
 						<view class="applyitem">
 							<image src="../../../static/images/name.png" style="width: 17px;height: 18px;" mode="widthFix"></image>
@@ -279,7 +279,7 @@
 				msg:{
 					Name:'',
 				},
-				
+				contentHeight:0,
 				checked:false,
 				isshowagreement:false,
 				isshowagreement_t:false,
@@ -294,13 +294,19 @@
 				scrollTop:0,
 				QRcodeShow:false,
 				fenxqrcode:'',
+				modelstype:60,
 			}
 		},
 		created() {
 			this.nav = uni.getMenuButtonBoundingClientRect().top;
 			 this.mainColor = this.$uiConfig.mainColor;
 			this.headStyle.paddingTop = this.nav +'px';
-			
+			let c = this.$uiConfig.is_bang ? 80 : 52;
+			this.contentHeight = this.$utils.calcContentHeight(c);
+			console.log(this.contentHeight)
+			if(this.contentHeight>690 ){
+				this.modelstype=80
+			}
 		},
 		onLoad(){
 			this.u = uni.getStorageSync("mall_UserInfo");

pages/share/index/index.vue

@@ -116,7 +116,7 @@
 					<image src="../../../static/images/yue.png" style="width: 25px;height: auto;" mode ='widthFix'></image>
 					<view style="display: flex;flex-direction: column;margin-left: 17px;height: 100%;justify-content: space-between;">
 						<Text style='font-size: 22px;'>{{sharedata.UserInfo.CommissionWithdrawal!=null ?sharedata.UserInfo.CommissionWithdrawal:0}} <Text  style='font-size: 14px;'>元</Text> </Text>
-						<text>{{sharedata.CustomModel.WithdrawableName}}</text>
+						<text>{{sharedata.CustomModel.CommissionForWithdrawalName}}</text>
 					</view>
 				</view>
 				<view style="width: 60px;height: 30px;border-radius: 15px;color: #fff; margin-right: -30px;background-image: linear-gradient( to right,#FF8585,#ED4353);text-align: center;line-height: 30px;"