Compare commits

..

No commits in common. "71332e070af09ab55302adddb689b14d0d5c28d8" and "7961d4a5a2fa3f3e3ae8bf3df91797c46092231d" have entirely different histories.

6 changed files with 73 additions and 59 deletions

View File

@ -1,5 +1,4 @@
export const apiPay = {
pay: '/api/v1/lakala/preorder', //预下单
queryPay: '/api/v1/lakala/trade-query', //查询交易结果
qrcode: '/api/v2/wechat/quick-payment-record-crud/qrcode' //快捷支付二维码
queryPay: '/api/v1/lakala/trade-query' //查询交易结果
}

View File

@ -401,14 +401,6 @@ export default {
this.currentRoom = item;
this.getOrderList();
//
if (this.active === 1) {
//
this.page_num = 1;
this.page_size = 10;
this.getPayList();
}
},
//

View File

@ -164,38 +164,76 @@ export default {
this.Money = value;
},
changeBoxshadow2() {
this.boxShow = !this.boxShow
},
changeBoxshadow() {
createQrcode() {
uni.showLoading({
title: '加载中',
mask: true
});
const params = {
merchant_id: this.info.id,
}
request(apiPay.qrcode, "POST", params).then(res => {
uni.hideLoading();
if (res && res.qrcode_image_url) {
this.myCode = picUrl + res.qrcode_image_url;
this.boxShow = !this.boxShow;
} else {
uni.request({
url: 'https://api.weixin.qq.com/cgi-bin/token',
data: {
grant_type: 'client_credential',
appid: "wx1addb25675dd8e70",
secret: "1c153a91d0558b4c3834a4399ebc7496"
},
header: {
// 'custom-header': 'hello' //
},
success: (res) => {
// access_token
if (res.data && res.data.access_token) {
this.createQrcode2(res.data.access_token)
} else {
uni.hideLoading();
uni.showToast({
title: '获取二维码失败,请重试',
icon: 'none'
});
console.error('获取微信access_token失败:', res);
}
},
fail: (err) => {
console.error('获取微信access_token失败:', err);
uni.hideLoading();
uni.showToast({
title: '获取二维码失败,请重试',
icon: 'none'
});
}
}).catch(err => {
console.error('获取二维码失败:', err);
uni.hideLoading();
uni.showToast({
title: '获取二维码失败,请重试',
icon: 'none'
});
});
},
createQrcode2(e) {
let that = this
uni.request({
url: `https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=${e}`,
method: 'post',
data: {
path: '/packages/localLife/pay/index'
},
header: {
// 'custom-header': 'hello' //
'content-type': 'application/json'
},
responseType: 'arraybuffer',
success: (res) => {
uni.hideLoading();
// this.text = 'request success';
let data = uni.arrayBufferToBase64(res.data)
console.log(data);
that.myCode = 'data:image/png;base64,' + data
this.boxShow = !this.boxShow
},
fail: (res) => {
uni.hideLoading();
}
});
},
changeBoxshadow2() {
this.boxShow = !this.boxShow
},
changeBoxshadow() {
this.createQrcode()
},
confirm(e) {
console.log(e);

View File

@ -76,7 +76,6 @@ export default {
}
},
async onLoad() {
uni.removeStorageSync('changeWorkOrderData');
const workOrderPermission = uni.getStorageSync('work_order_permission');
const orderDispatchPermission = uni.getStorageSync('order_dispatch_permission');
this.showWorkOrderSection = !(workOrderPermission === false && orderDispatchPermission === false);

View File

@ -62,17 +62,7 @@ page {
pointer-events: auto;
}
.avatar_setting_box{
width: 70rpx;
height: 50rpx;
overflow: hidden;
display: flex;
justify-content: center;
align-items: center;
margin: 0 5rpx;
}
.avatar_setting_box image {
.avatar_setting>image {
width: 34rpx;
height: 34rpx;
}

View File

@ -10,25 +10,21 @@
<view class="avatar_title">
<view class="login-btn">{{ userInfo.nick_name ? userInfo.nick_name : '登录/注册' }}</view>
<view class="avatar_setting">
<view class="avatar_setting_box">
<image
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/page_user_Vector13.png"
mode="" @click.stop="headerRefreshClick" />
</view>
<!-- <button class="login-btn" open-type="getPhoneNumber" style="display: none;"
@click="headerLoginClick" @getphonenumber="getPhoneNumber" id="hiddenLoginBtn"></button> -->
<view class="avatar_setting_box">
<image
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/page_user_Vector14.png"
mode="" @click.stop="headerSettingsClick" />
</view>
<image
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/page_user_Vector13.png"
mode="" @click.stop="headerRefreshClick" />
<button class="login-btn" open-type="getPhoneNumber" style="display: none;"
@click="headerLoginClick" @getphonenumber="getPhoneNumber" id="hiddenLoginBtn"></button>
<image
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/page_user_Vector14.png"
mode="" @click.stop="headerSettingsClick" />
</view>
</view>
<view class="avater_mobile">{{ userInfo.mobile }}</view>
</view>
</view>
<view class="section section1">
<view class="section_label" @click="goWallet(1, userInfo)">
<view class="section_label" @click="goWallet(1,userInfo)">
<view>{{ userInfo.points }}</view>
<view>积分</view>
</view>
@ -36,7 +32,7 @@
<view>0.00</view>
<view>繁华币</view>
</view>
<view class="section_label" @click="goWallet(2, userInfo)">
<view class="section_label" @click="goWallet(2,userInfo)">
<view>{{ userInfo.property_housing_fund }}</view>
<view>物业费公积金</view>
</view>
@ -117,7 +113,7 @@
</u-grid>
</view>
</view>
<view class="main margin20" v-if="shopManagementList.some(item => item.isShow)">
<view class="main margin20" v-if="shopManagementList.some(item => item.isShow)">
<view class="main_title">功能服务</view>
<view class="item1 padding_bottom0">
<u-grid col="4" :border="false">
@ -271,7 +267,7 @@ export default {
},
methods: {
goWallet(type, item) {
goWallet(type,item) {
NavgateTo('/packages/user/wallet/index?type=' + type + '&item=' + JSON.stringify(item));
},
//