Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/goods/components/draw/style1.vue

@@ -650,7 +650,7 @@ export default {
   width: 750px;
   height: 1344px;
   position: absolute;
-  top: -1344px;
-  left: -750px;
+  top: -2000px;
+  left: -1500px;
 }
 </style>

pages/goods/components/draw/style2.vue

@@ -610,7 +610,7 @@ export default {
   width: 750px;
   height: 1344px;
   position: absolute;
-  top: -1344px;
-  left: -750px;
+  top: -2000px;
+  left: -1500px;
 }
 </style>

pages/goods/components/draw/style3.vue

@@ -572,7 +572,7 @@ export default {
   width: 750px;
   height: 1344px;
   position: absolute;
-  top: -1344px;
-  left: -750px;
+  top: -2000px;
+  left: -1500px;
 }
 </style>

pages/goods/components/draw/style4.vue

@@ -591,7 +591,7 @@ export default {
   width: 750px;
   height: 1344px;
   position: absolute;
-  top: -1344px;
-  left: -750px;
+  top: -2000px;
+  left: -1500px;
 }
 </style>

pages/share-order/share-order.vue

@@ -36,7 +36,7 @@
 									</view>
 									<view class="center_l">
 										
-										<Text>预计佣金：<Text :style="{color:mainColor}">{{item.Commission}}</Text>元 </Text>
+										<Text>{{item.CommissionState==1? '待返佣':'已返佣'}}：<Text :style="{color:mainColor}">{{item.Commission}}</Text>元 </Text>
 										<u-icon name="arrow" v-if='item.showdetail==false'></u-icon>
 										<u-icon name="arrow-down" v-if='item.showdetail==true'></u-icon>
 									</view>

pages/share/cash/cash.vue

@@ -16,7 +16,7 @@
 				<view class="tixian">
 					<view style='display: flex;flex-direction: row;align-items: center;'>
 						<Text :style="{'color':mainColor,'font-size':'18px'}">￥</Text>
-						<input class="uni-input" type="digit"  v-model="msg.AppliedMoney" placeholder="请输入提现金额" @input='liedMoney' style="font-size: 16px;margin-left: 5px;"/>
+						<input class="uni-input" type="digit" :disabled='true' v-model="msg.AppliedMoney" placeholder="请输入提现金额" @input='liedMoney' style="font-size: 16px;margin-left: 5px;"/>
 					</view>
 					<Text @click='allmoney'>全部</Text>
 				</view>
@@ -171,13 +171,14 @@
 						x.checked = false
 					})
 					this.list = WayList
-					
+					this.msg.AppliedMoney = Number(this.cash.CommissionWithdrawal)
+					this.msg.Fee =   (Number(this.cash.WithdrawFee*0.01*this.msg.AppliedMoney)).toFixed(2);
 				  }
 				);
 			},
 			allmoney(){
-				this.msg.AppliedMoney = Number(this.cash.CommissionWithdrawal) 
-				this.msg.Fee =   (Number(this.cash.WithdrawFee*0.01*this.msg.AppliedMoney)).toFixed(2);
+				// this.msg.AppliedMoney = Number(this.cash.CommissionWithdrawal) 
+				// this.msg.Fee =   (Number(this.cash.WithdrawFee*0.01*this.msg.AppliedMoney)).toFixed(2);
 			},
 			liedMoney(val){
 				this.msg.AppliedMoney = Number(val.target.value) 
@@ -198,7 +199,8 @@
 				uni.requestSubscribeMessage({
 				  tmplIds: that.cash.template_message_list,
 				  complete (res) { 
-					  if(that.msg.AppliedMoney==''){
+					  console.log(that.msg.AppliedMoney)
+					  if(that.msg.AppliedMoney<0){
 					  	uni.showToast({
 					  		title: "请输入提现金额",
 					  		icon: "none"