Compare commits

..

No commits in common. "2030e5e84d4db3a4a91f0eb36f297d85ec0d48da" and "8d60cb6200d832d0cc95d69e6dfb27e3664e40df" have entirely different histories.

5 changed files with 7 additions and 18 deletions

View File

@ -15,7 +15,7 @@
<image
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communitySearchIcon.png"
mode="aspectFill"></image>
<input type="text" v-model="searchText" placeholder="请输入您想搜索的内容" @confirm="handleSearch" />
<input type="text" placeholder="请输入您想搜索的内容" />
</view>
</view>
</view>
@ -141,7 +141,6 @@ export default {
page_num: 1,
flag: false,
merchatList: [],
searchText: ''
};
},
onLoad(options) {
@ -197,19 +196,12 @@ export default {
}
});
},
//
handleSearch() {
this.page_num = 1;
this.merchatList = [];
this.getMechantList();
},
//
async getMechantList() {
let that = this;
await request(apiArr.getMerchantList, "POST", {
page_num: that.page_num,
page_size: that.page_size,
merchant_name: that.searchText
}).then((res) => {
let latitude = uni.getStorageSync("location").lat;
let longitude = uni.getStorageSync("location").lng;

View File

@ -121,10 +121,8 @@ export default {
},
watch: {
Money(newVal) {
const homeMoney1 = newVal * (this.info.refund_property_fee_ratio || 0)
this.homeMoney = homeMoney1.toFixed(2);
const integral1 = newVal * (this.info.refund_user_points_ratio || 0)
this.integral = integral1.toFixed(2);
this.homeMoney = newVal * (this.info.refund_property_fee_ratio || 0);
this.integral = newVal * (this.info.refund_user_points_ratio || 0);
},
},

View File

@ -19,7 +19,7 @@
去充值
</view> -->
<view class="balance-icon">
<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com//user_wallet2.png" mode="widthFix" />
<image src="http://localhost:8080/user_wallet2.png" mode="widthFix" />
</view>
</view>
</view>

View File

@ -90,7 +90,7 @@ export default {
this.top = meun.top;
this.localHeight = meun.height;
this.topVal = options.type == 1 ? '积分' : (options.type == 2 ? '物业公积金' : '红包卡券');
this.photoVal = options.type == 1 ? 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com//user_wallet1.png' : (options.type == 2 ? 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com//user_wallet2.png' : 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com//user_wallet3.png');
this.photoVal = options.type == 1 ? 'http://localhost:8080/user_wallet1.png' : (options.type == 2 ? 'http://localhost:8080/user_wallet2.png' : 'http://localhost:8080/user_wallet3.png');
this.itemObj = JSON.parse(options.item);
this.itemType = options.type;
this.balance = options.type == 1 ? this.itemObj.points : (options.type == 2 ? this.itemObj.property_housing_fund : 0)

View File

@ -16,7 +16,7 @@
<view class="balance-title">{{ topVal }}</view>
<view class="balance-amount">{{ balance }}</view>
<view class="balance-icon">
<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com//user_wallet2.png" mode="widthFix" />
<image src="http://localhost:8080/user_wallet2.png" mode="widthFix" />
</view>
</view>
</view>
@ -36,8 +36,7 @@
<view class="record-time">{{ record.change_time }}</view>
</view>
<view class="record-amount">
<view class="record-balance" v-if="topVal == '应收' || topVal == '已收'">{{ record.change_reason ==
1 ? '收款' :
<view class="record-balance" v-if="topVal == '应收' || topVal == '已收'">{{ record.change_reason == 1 ? '收款' :
'退款' }}</view>
<view class="record-balance" v-else-if="topVal == '待收物业公积金'">待收</view>
<view class="record-balance" v-else-if="topVal == '手续费'">手续费</view>