Merge remote-tracking branch 'origin/ldt' into ldt

pages/member/add.vue

@@ -16,7 +16,7 @@
 				<u-form :model="form" ref="uForm" label-width="180" label-align="right">
 					<u-form-item label="积分兑率" :border-bottom="false">
 						<view class="margin-left-20">
-							<u-slider :min="1" height="10" :max="30" v-model="value"  active-color="#EF9944" :use-slot="true" >
+							<u-slider :min="3" height="10" :max="30" v-model="value"  active-color="#EF9944" :use-slot="true" >
 								<view class="">
 									<view class="" >
 										<view class="badge-button">

pages/my-bills/bills-detail.vue

@@ -21,7 +21,7 @@
 				</view>
 				<view class="data">
 					<view class="price plus text-base text-bold" style="padding: 0;">
-						<block v-if="$isNotEmpty(billDetail.receiveNumTotal)">{{billDetail.receiveNumTotal}}</block>
+						<block v-if="$isNotEmpty(billDetail.actualIncome)">{{billDetail.actualIncome}}</block>
 						<block v-else>{{billDetail.cost}}</block>
 					</view>
 				</view>
@@ -55,6 +55,10 @@
 					<text>交易手续费</text>
 					<text class="text-base text-bold price reduce">{{billDetail.merchantFee || 0.00}}</text>
 				</view>
+				<view class="item">
+					<text>赠送积分</text>
+					<text class="text-base text-bold price reduce">{{billDetail.sendPoint || 0.00}}</text>
+				</view>
 				<view class="item">
 					<text>交易状态</text>
 					<text>{{billDetail.payStatus}}</text>

pages/my-bills/comps/balance-bills.vue

@@ -84,7 +84,7 @@
 					<text>{{discount(item.discount)}}</text>
 				</view>
 				<view class="area3">
-					<text class="text-base price plus">{{item.receiveNumYp || 0}}</text>
+					<text class="text-base price plus">{{item.actualIncome || 0}}</text>
 				</view>
 			</navigator>
 		</view>

pages/my-bills/comps/bills.vue

@@ -71,7 +71,7 @@
 					<text>{{discount(item.discount)}}</text>
 				</view>
 				<view class="area3">
-					<text class="text-base price" v-if="$isNotEmpty(item.receiveNumTotal)">{{item.receiveNumTotal}}</text>
+					<text class="text-base price" v-if="$isNotEmpty(item.actualIncome)">{{item.actualIncome}}</text>
 					<text class="text-base price" v-else>{{item.cost || 0}}</text>
 				</view>
 			</navigator>