修改好店支付的本页二维码逻辑

api/pay.js

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

packages/community/propertyPayment/index.vue

@@ -401,6 +401,14 @@ export default {
 
       this.currentRoom = item;
       this.getOrderList();
+      
+      // 如果当前是缴费记录标签页，重新请求缴费记录数据
+      if (this.active === 1) {
+        // 重置分页参数
+        this.page_num = 1;
+        this.page_size = 10;
+        this.getPayList();
+      }
     },
 
     //获取用户公积金

packages/localLife/pay/index.vue

@@ -164,76 +164,38 @@ export default {
             this.Money = value;
         },
 
-        createQrcode() {
+
+        changeBoxshadow2() {
+            this.boxShow = !this.boxShow
+        },
+        changeBoxshadow() {
             uni.showLoading({
                 title: '加载中',
                 mask: true
             });
-            uni.request({
+            const params = {
-                url: 'https://api.weixin.qq.com/cgi-bin/token',
+                merchant_id: this.info.id,
-                data: {
+            }
-                    grant_type: 'client_credential',
+            request(apiPay.qrcode, "POST", params).then(res => {
-                    appid: "wx1addb25675dd8e70",
+                uni.hideLoading();
-                    secret: "1c153a91d0558b4c3834a4399ebc7496"
+                if (res && res.qrcode_image_url) {
-                },
+                    this.myCode = picUrl + res.qrcode_image_url;
-                header: {
+                    this.boxShow = !this.boxShow;
-                    // 'custom-header': 'hello' //自定义请求头信息
+                } else {
-                },
-                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);

packages/workOrderDashboard/guide/index.vue

@@ -76,6 +76,7 @@ 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);

pages/user/index.css

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

pages/user/index.vue

@@ -10,21 +10,25 @@
 				<view class="avatar_title">
 					<view class="login-btn">{{ userInfo.nick_name ? userInfo.nick_name : '登录/注册' }}</view>
 					<view class="avatar_setting">
-						<image
+						<view class="avatar_setting_box">
-							src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/page_user_Vector13.png"
+							<image
-							mode="" @click.stop="headerRefreshClick" />
+								src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/page_user_Vector13.png"
-						<button class="login-btn" open-type="getPhoneNumber" style="display: none;"
+								mode="" @click.stop="headerRefreshClick" />
-							@click="headerLoginClick" @getphonenumber="getPhoneNumber" id="hiddenLoginBtn"></button>
+						</view>
-						<image
+						<!-- <button class="login-btn" open-type="getPhoneNumber" style="display: none;"
-							src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/page_user_Vector14.png"
+							@click="headerLoginClick" @getphonenumber="getPhoneNumber" id="hiddenLoginBtn"></button> -->
-							mode="" @click.stop="headerSettingsClick" />
+						<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>
 					</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>
@@ -32,7 +36,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>
@@ -113,7 +117,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">
@@ -267,7 +271,7 @@ export default {
 	},
 
 	methods: {
-		goWallet(type,item) {
+		goWallet(type, item) {
 			NavgateTo('/packages/user/wallet/index?type=' + type + '&item=' + JSON.stringify(item));
 		},
 		// 头像点击