From fcceeb05d47be8137c2bb2cdbac9c74fa1fe9520 Mon Sep 17 00:00:00 2001
From: lin <1005713861@163.com>
Date: Tue, 26 May 2026 11:20:15 +0800
Subject: [PATCH] feat:星享购 绑卡+权收

---
 pages/my/my.vue |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/pages/my/my.vue b/pages/my/my.vue
index 5dd3e69..5dbb64b 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -6,7 +6,8 @@
 		<view class="startBar"></view>
 		<view class="myContent">
 			<view class="myHeader">
-				<image :src="userInfo != null ? userInfo.avatar : '/static/imgs/headimg.png'" class="avatar" mode="" @tap="setImg"></image>
+				<image :src="userInfo != null ? userInfo.avatar : '/static/imgs/headimg.png'" class="avatar" mode=""></image>
+				<!-- <image :src="userInfo != null ? userInfo.avatar : '/static/imgs/headimg.png'" class="avatar" mode="" @tap="setImg"></image> -->
 				<view class="myNick">
 					<template>
 						<view v-if="userInfo == null" @tap="$util.goPages('/pages/login/login')">未登录</view>
@@ -69,15 +70,15 @@
 							<image src="/static/imgs/right.png" mode=""></image>
 						</view>
 					</template>
-					<!-- <view class="mySerCon-v" @tap="toHuishou" >
+					<view class="mySerCon-v" @tap="toHuishou"  v-if="isShop">
 						<view class="mySerCon-l">
-						  <template v-if="isShop">
+						  <template>
 							<image src="/static/imgs/quanshou.png" mode="widthFix"></image>
 							<text>会员权收</text>
 						  </template>
 						</view>
 						<image src="/static/imgs/right.png" mode=""></image>
-					</view> -->
+					</view>
 				</view>
 			</view>
 			
@@ -94,14 +95,18 @@
 			<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;" >
+			  <view style="border-radius: 48rpx;padding: 28rpx 0;width: 538rpx;background: #FFFFFF;padding-top: 0;">
+			    <view style="background: url('/static/img/xuniBg.png') no-repeat top center; background-size: 100%;width: 100%;height: 300rpx;border-radius: 48rpx 48rpx 0 0;">
+			      <!-- <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 style="font-size: 32rpx;font-weight: 600;color: #333333;text-align: center;margin-top: 34rpx;margin-bottom: 80rpx;padding: 0 28rpx;">{{errState}}</view> -->
+				  
 			    </view>
+				<view style="font-size: 32rpx;font-weight: 600;color: #333333;text-align: center;margin-top: 60rpx;margin-bottom: 80rpx;padding: 0 28rpx;">
+				  <view>{{ errState }}</view>
+				</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: #4766FE;border-radius: 40rpx ;margin: 0 40rpx;">好的</view>
 			  </view>
 			
 			</uni-popup>
@@ -148,7 +153,7 @@
 			  const _this = this;
 			  if(_this.$util.getUserInfo()?.phone){
 				uni.request({
-				  url: _this.$webHost+'/api/v2/auth/qxgIosUnionLogin?phone='+_this.$util.getUserInfo().phone,
+				  url: _this.$webHost+'/api/v2/auth/iosShopUnionLogin?phone='+_this.$util.getUserInfo().phone + '&configureToDomain=11',
 				  data:{
 					customerId: uni.getStorageSync('ygxLogin').customerId,
 					appId: uni.getStorageSync('ygxLogin').appId
@@ -160,6 +165,8 @@
 					console.log('res',res)
 				  }
 				})
+			  } else {
+				  _this.isShop = false
 			  }
 		},
 		methods: {
@@ -220,7 +227,7 @@
 					sizeType: ['original', 'compressed'],
 					success: (chooseImageRes) => {
 						let tempFilePaths = chooseImageRes.tempFilePaths
-						let token = uni.getStorageSync('lzsc-token')
+						let token = uni.getStorageSync('pig-token')
 						let header = {
 							'Accept': 'application/json',
 							'authorization': token,

--
Gitblit v1.9.3