From c58af6564eec08ebbdc91c6114098883d263154b Mon Sep 17 00:00:00 2001
From: shuxiaoquan <853623962@qq.com>
Date: Tue, 12 Mar 2024 17:11:32 +0800
Subject: [PATCH] =?UTF-8?q?'=E5=BE=AE=E4=BF=A1=E6=98=B5=E7=A7=B0=E4=B8=8E?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E4=BA=8C=E7=BB=B4=E7=A0=81'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/list.vue    |  2 +-
 pages/news1/setting.vue | 15 +++++++++++----
 pages/serve/install.vue |  8 ++++++--
 pages/user/index.vue    | 11 ++++++-----
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index d8f65e7..8a3b77c 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -17,7 +17,7 @@
 						</view>
 					</scroll-view>
 				</view>
-				<view class="goodsType">
+				<view class="goodsType" v-if="goodsType && goodsType.length > 0">
 					<scroll-view class="typeList" scroll-x="true">
 						<view v-for="(item,index) in goodsType" :key="index" class="typeItem" @click="onChage(item,2)"
 							:style="{'color':isActive==item.category_id?'#F43B21':'#5A5A5A','background':isActive==item.category_id?'#FEF6F6':'#F7F8FA','border':isActive==item.category_id?'2rpx solid #F22029':'none'}">
diff --git a/pages/news1/setting.vue b/pages/news1/setting.vue
index a3ab11b..0e3f4cc 100644
--- a/pages/news1/setting.vue
+++ b/pages/news1/setting.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="setting">
+		<form @submit="sureSubmit">
 		<view class="box">
 			<view class="box-avter" style="padding-bottom: 24rpx;">
 				<view class="name-text">
@@ -17,7 +18,7 @@
 				<view class="name-text">
 					昵称
 				</view>
-				<input type="text" v-model="info.nick_name" placeholder="请输入用户昵称">
+				<input type="nickname" :value="info.nick_name" name='nick_name' placeholder="请输入用户昵称">
 			</view>
 			<view class="box-avter conten-height">
 				<view class="name-text">
@@ -72,9 +73,10 @@
 			</view>
 		</view>
 		<view class="bottomBtn">
-			<button class="submitBtn" @click="sureSubmit">确认修改</button>
+			<!--  @click="sureSubmit" -->
+			<button class="submitBtn"  formType="submit">确认修改</button>
 		</view>
-
+	   </form>
 	</view>
 </template>
 
@@ -105,6 +107,9 @@ export default {
 		this.genderIndex = this.info.gender == '男' ? 0 : 1
 	},
 	methods: {
+		formSubmit(e) {
+			console.log(e)
+		},
 		chooseavatar(e){
 			console.log(e)
 			let tempFiles = e.detail.avatarUrl;
@@ -116,7 +121,9 @@ export default {
 			])
 			this.uploadFile()
 		},
-		sureSubmit() {
+		sureSubmit(e) {
+			console.log(e)
+			this.info.nick_name = e.detail.value.nick_name
 			let params = {
 				nick_name: this.info.nick_name,
 				avatar_id: this.avatar_id[0],
diff --git a/pages/serve/install.vue b/pages/serve/install.vue
index 47380f4..f14c9f4 100644
--- a/pages/serve/install.vue
+++ b/pages/serve/install.vue
@@ -23,8 +23,8 @@
 					识别二维码
 				</view>
 				<view class="txm">
-					<image :src="qrcode"
-						@click="clickImg" mode="" class="codeImg"></image>
+					<image :src="qrcode" :show-menu-by-longpress="true"
+						mode="" class="codeImg"></image>
 				</view>
 			</view>
 		</view>
@@ -51,6 +51,10 @@
 			onLookCord(url) {
 				this.showQRCodePopup = true
 				this.qrcode = createQrCodeImg(url, { 'size': 500 });
+				// uni.previewImage({
+				// 	current:: this.qrcode
+				// 	urls: [this.qrcode]
+				// })
 			},
 			/**
 			 * 获取列表
diff --git a/pages/user/index.vue b/pages/user/index.vue
index e62220c..3c8a95e 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -7,13 +7,14 @@
 			<view class="box_1">
 				<image :src="$picUrl+'/static/default-logo.png'" v-if="!isLogin || !userInfo.avatar_url" class="image_2"
 					@click="goLogin()"></image>
-				<image :src="userInfo.avatar_url" v-else class="image_2"></image>
+				<image :src="userInfo.avatar_url" @click="goJump('/pages/news1/setting')" v-else class="image_2"></image>
 				<view class="group_1">
 					<view class="image-text_1" v-if="!isLogin" @click="goLogin()">
 						未登录
 					</view>
-					<button class="avatar-wrapper" v-else type="primary" open-type="chooseAvatar"
-						@chooseavatar="onChooseAvatar">
+					<!--  open-type="chooseAvatar"
+						@chooseavatar="onChooseAvatar" -->
+					<button class="avatar-wrapper" v-else type="primary" @click="goJump('/pages/news1/setting')">
 						<text lines="1" class="text-group_1">{{userInfo.nick_name}}</text>
 						<image :src="$picUrl+'/static/user/weChat.png'" class="thumbnail_1"></image>
 					</button>
@@ -554,8 +555,8 @@
 					<text v-if="lookMemberType == 3">我的专属分销识别码</text>
 				</view>
 				<view class="codeImg">
-					<image v-if="lookMemberType == 2" :src="qrcode" class="img"></image>
-					<image v-if="lookMemberType == 3" :src="qrcode" class="img"></image>
+					<image v-if="lookMemberType == 2" :show-menu-by-longpress="true" :src="qrcode" class="img"></image>
+					<image v-if="lookMemberType == 3" :show-menu-by-longpress="true" :src="qrcode" class="img"></image>
 				</view>
 				<view class="codeName">
 					{{userInfo.user_id}}