From 4065a1ffca0287fa48bcd35916450b6859e870dc Mon Sep 17 00:00:00 2001
From: yfx <1249361928@.com>
Date: Mon, 16 Mar 2026 08:58:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pages/my/my.vue | 87 +++++++++----------------------------------
1 files changed, 18 insertions(+), 69 deletions(-)
diff --git a/pages/my/my.vue b/pages/my/my.vue
index b34d3ad..68d6f01 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -5,7 +5,7 @@
<view class="startBar" style="background-color: #e3b400;"></view>
<view class="myTop">
<view class="headimg">
- <image :src="userInfo != null ? userInfo.avatar : '/static/imgs/headimg.png'" class="" mode="widthFix" @tap="setImg"></image>
+ <image :src="userInfo != null ? userInfo.avatar : '/static/imgs/headimg.png'" class="" mode="" @tap="setImg"></image>
<view class="">
<template>
<view v-if="userInfo == null" @tap="$util.goPages('/pages/login/login')">未登录</view>
@@ -38,23 +38,23 @@
</view>
<view class="myNavs-view">
<view class="myNavs-item" @tap="$util.checkLogin('/pages/order/order?status=1')">
- <image class="myNavs-item-icon" src="/static/imgs/my-n-1.png" mode="widthFix"></image>
+ <image class="myNavs-item-icon" src="/static/imgs/my-n-1.png" mode=""></image>
<text class="myNavs-item-text">待支付</text>
</view>
<view class="myNavs-item" @tap="$util.checkLogin('/pages/order/order?status=3')">
- <image class="myNavs-item-icon" src="/static/imgs/my-n-5.png" mode="widthFix"></image>
+ <image class="myNavs-item-icon" src="/static/imgs/my-n-5.png" mode=""></image>
<text class="myNavs-item-text">待签约</text>
</view>
<view class="myNavs-item" @tap="$util.checkLogin('/pages/order/order?status=4')">
- <image class="myNavs-item-icon" src="/static/imgs/my-n-2.png" mode="widthFix"></image>
+ <image class="myNavs-item-icon" src="/static/imgs/my-n-2.png" mode=""></image>
<text class="myNavs-item-text">待发货</text>
</view>
<view class="myNavs-item" @tap="$util.checkLogin('/pages/order/order?status=5')">
- <image class="myNavs-item-icon" src="/static/imgs/my-n-3.png" mode="widthFix"></image>
+ <image class="myNavs-item-icon" src="/static/imgs/my-n-3.png" mode=""></image>
<text class="myNavs-item-text">待收货</text>
</view>
<view class="myNavs-item" @tap="$util.checkLogin('/pages/order/order?status=8')">
- <image class="myNavs-item-icon" src="/static/imgs/my-n-4.png" mode="widthFix"></image>
+ <image class="myNavs-item-icon" src="/static/imgs/my-n-4.png" mode=""></image>
<text class="myNavs-item-text">已完成</text>
</view>
</view>
@@ -66,36 +66,32 @@
</view>
<view class="myServe-view">
<view class="myServe-item" @tap="$util.checkLogin('/pages/profile/profile')">
- <image src="/static/imgs/my-s-1.png" mode="widthFix"></image>
+ <image src="/static/imgs/my-s-1.png" mode=""></image>
<text>个人信息</text>
</view>
<view class="myServe-item" @tap="$util.checkLogin('/pages/logs/logs')" v-if="Config && Config.put_open == 2">
- <image src="/static/imgs/my-s-2.png" mode="widthFix"></image>
+ <image src="/static/imgs/my-s-2.png" mode=""></image>
<text>账单信息</text>
</view>
<view class="myServe-item" @tap="$util.checkLogin('/pages/bank/bank')">
- <image src="/static/imgs/my-s-3.png" mode="widthFix"></image>
+ <image src="/static/imgs/my-s-3.png" mode=""></image>
<text>银行卡</text>
</view>
<view class="myServe-item" @tap="$util.checkLogin('/pages/address/address')">
- <image src="/static/imgs/my-s-4.png" mode="widthFix"></image>
+ <image src="/static/imgs/my-s-4.png" mode=""></image>
<text>我的地址</text>
</view>
<view class="myServe-item" @tap="$util.checkLogin('/pages/collect/collect')">
- <image src="/static/imgs/my-s-5.png" mode="widthFix"></image>
+ <image src="/static/imgs/my-s-5.png" mode=""></image>
<text>我的收藏</text>
</view>
<view class="myServe-item" @tap="goKefu">
- <image src="/static/imgs/my-s-6.png" mode="widthFix"></image>
+ <image src="/static/imgs/my-s-6.png" mode=""></image>
<text>联系客服</text>
</view>
- <view class="myServe-item" @tap="toHuishou" >
- <template v-if="isShop">
- <image src="/static/imgs/quanshou.png" mode="widthFix"></image>
- <text>会员权收</text></template>
-
- </view>
-
+ <view class="myServe-item" v-if="Config.put_open == 1">
+
+ </view>
</view>
</view>
<view class="myBeiAn">
@@ -110,19 +106,6 @@
</view>
<agreePup ref="agreePup1" :gp="1" title="注册协议"></agreePup>
<agreePup ref="agreePup2" :gp="2" title="隐私政策"></agreePup>
-
- <uni-popup type="center" ref="comment" >
- <view style="background-image: url('/static/imgs/BOXSDF.png');background-repeat: no-repeat;background-size: 100% 100%">
- <view style="border-radius: 48rpx;padding: 28rpx 20rpx">
- <view style="text-align: center;padding-top: 30rpx;" >
- <image src="/static/imgs/wuImg.png" style="width: 372rpx;height: 240rpx;"></image>
- </view>
- <view style="font-size: 32rpx;font-weight: 600;color: #333333;text-align: center;margin-top: 34rpx;margin-bottom: 80rpx;padding: 0 28rpx;">{{errState}}</view>
- <view @click="$refs.comment.close()" style="font-weight: 500;font-size: 32rpx;color: #fff;text-align: center;padding: 24rpx 28rpx;border-top: 2rpx solid #EEEEEE;background: #FF1472;;border-radius: 40rpx ;">好的</view>
- </view>
- </view>
-
- </uni-popup>
</view>
</template>
@@ -137,49 +120,15 @@
return {
userInfo: this.$util.getUserInfo(),
Config: {put_open: 1},
- isShop:false,
- errState:''
}
},
- onLoad() {
+ onLoad() {
},
- async onShow() {
+ onShow() {
this.getConfig()
this.getUserInfo()
- const _this = this;
- if(_this.$util.getUserInfo()?.phone){
- await uni.request({
- url: _this.$webHost+'/api/v2/auth/qxgIosUnionLogin?phone='+_this.$util.getUserInfo().phone,
- success: function (res) {
- _this.isShop = res.data.data.isShop;
- }
- })
- }
},
methods: {
- toHuishou(){
- const _this = this;
- if(!_this.isShop){
- return
- }
- uni.request({
- url: _this.$webHost+'/api/v2/customer/ryxIsBuyEquity?phone='+_this.$util.getUserInfo().phone,
- success: function (res) {
- if(res.data.code==200){
- uni.navigateTo( {
- url: '/pages/quanshou/index'
- })
-
- } else {
- _this.errState = res.data.data;
- _this.$refs.comment.open()
-
- }
- }
- })
-
- },
-
goKefu() {
if(this.Config && this.Config.kefu_open == 1) {
this.wechatWork()
@@ -238,7 +187,7 @@
getUserInfo () {
let t = this
t.$util.post('User/getUser').then(res => {
- t.userInfo = res.data
+ t.userInfo = res.data
})
},
agreeDialog1 (e) {
--
Gitblit v1.9.3