Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_qianduan

pages/index/index.vue

@@ -1029,7 +1029,7 @@
 			}
 			.secondRows{
 				.imageC{
-					background-color: #F3F3F3;
+					// background-color: #F3F3F3;
 					border-radius: 50%;
 					overflow:hidden;
 					display: flex;

pages/user/index.vue

@@ -33,6 +33,7 @@
 						<image :src="$picUrl+'/static/user/code.png'" class="thumbnail_2"></image>
 						<text lines="1" class="text_3">会员码</text>
 					</view>
+					<!-- 、  -->
 					<view class="group_5" @click="lookMemberCode('3')" v-if="userInfo.user_type == 30">
 						<image :src="$picUrl+'/static/user/code.png'" class="thumbnail_3"></image>
 						<text lines="1" class="text_4">分销码</text>
@@ -652,7 +653,8 @@
 						})
 						.then(result => {
 							let data = result.data.userInfo
-							data.qrcode = createQrCodeImg(data.user_id, {
+							console.log("data.user_id",data.user_id)
+							data.qrcode = createQrCodeImg(data.user_id.toString(), {
 								'size': 500
 							});
 							console.log(data)