Browse Source

2025-12-8

cmy 1 day ago
parent
commit
3d999425cd

+ 6 - 6
pages/modelData/modeltemplate/model_5.vue

@@ -12,7 +12,7 @@
 					<text class="noText">执</text>
 					<text class="noText">业</text>
 					<text class="noText">编</text>
-					<text class="noText"></text>
+					<text class="noText"></text>
 					<text class="noText">:</text>
 					<text class="noText trText" v-for="ls in no">{{ls}}</text>
 				</view>
@@ -254,7 +254,7 @@
 				font-family: STLiti;
 				font-weight: 400;
 				font-size: 56rpx;
-				line-height: 47rpx;
+				// line-height: 47rpx;
 				background-image: linear-gradient(to bottom, #B8937B 0%, #FFF9ED 50%, #CBA892 100%);
 				background-clip: text;
 				color: rgba(0, 0, 0, 0);
@@ -264,9 +264,9 @@
 
 		.avatar {
 			position: absolute;
-			left: 200rpx;
+			left: 125rpx;
 			top: 211rpx;
-			width: 377rpx;
+			width: 500rpx;
 			height: 860rpx;
 		}
 
@@ -277,11 +277,11 @@
 			width: 21rpx;
 			display: flex;
 			flex-direction: column;
-
+			margin-top: -50rpx;
 			.noText {
 				text-align: center;
 				font-size: 21rpx;
-				line-height: 1;
+				line-height: 21rpx;
 				font-weight: 400;
 				color: #0DF6F3;
 

+ 60 - 36
pages/user/model/modelrz.vue

@@ -17,10 +17,10 @@
 			</view>
 			<view class="con_box">
 				<view class="con_image">
-					<image class="img" v-if="modelid!=7" @click="navCroper(400,400,'one')"
+					<image class="img" v-if="modelid==7" @click="upImage('avatar',1)"
 						:src="updata.avatar||`../../../static/image/upImg.png`">
 					</image>
-					<image class="img" v-else @click="navCroper(377,860,'one')"
+					<image class="img" v-else @click="navCroper(400,400,'one')"
 						:src="updata.avatar||`../../../static/image/upImg.png`">
 					</image>
 				</view>
@@ -225,7 +225,7 @@
 									<pickerAddress class="buttom" @change="onCityClick">添加地区</pickerAddress>
 								</view>
 							</view>
-			
+
 						</view>
 					</view>
 					<view class="flex listItem">
@@ -251,21 +251,26 @@
 			<view class="listBox">
 				<view class="list">
 					<view class="listItem">
-						<editor id='editor' class="textarea" auto-height :maxlength='-1' @input='changeMyask' type="text"
+						<editor id='editor' class="textarea" auto-height :maxlength='-1' @input='changeMyask'
+							type="text"
 							placeholder="自我评价\n\n本人从业***年,已经服务***名客户\n成长经历:\n从事母婴工作之前是做***行业的,于***年经过专业培训后进入母婴行业;先后学习了***\n性格特征:\n本人性格直爽,具有很强的服务意识,做事认真负责,擅长……类工作\n服务格言:\n全心全意服务好每一位客户">
 						</editor>
 					</view>
 				</view>
-				<view class="con_box" >
+				<view class="con_box">
 					<view class="con_image" v-for="(item,ind) in updata.imageList">
-						<image class="img" v-if="modelid!=7" @click="navCroper(400,400,'tab',ind)" :src="item"></image>
-						<image class="img" v-else @click="navCroper(900,1200,'tab',ind)" :src="item"></image>
-						<image @click="updata.imageList.splice(ind,1)" class="tip" src="../../../static/icon/goodsExit.png"
-							mode="scaleToFill"></image>
+						<image class="img" v-if="modelid==7" @click="upImage('imageList',3,ind)" :src="item"></image>
+						<image class="img" v-else @click="navCroper(400,400,'tab',ind)" :src="item"></image>
+						
+						<image @click="updata.imageList.splice(ind,1)" class="tip"
+							src="../../../static/icon/goodsExit.png" mode="scaleToFill"></image>
 					</view>
 					<view class="con_image">
-						<image class="img" v-if="modelid!=7" @click="navCroper(400,400,'all')" src="../../../static/image/upImg.png"></image>
-						<image class="img" v-else @click="navCroper(900,1200,'all')" src="../../../static/image/upImg.png"></image>
+						<image class="img" v-if="modelid==7"  @click="upImage('imageList',2)"
+							src="../../../static/image/upImg.png"></image>
+						<image class="img" v-else @click="navCroper(400,400,'all')"
+							src="../../../static/image/upImg.png"></image>
+
 					</view>
 				</view>
 			</view>
@@ -296,7 +301,8 @@
 							src="../../../static/icon/goodsExit.png" mode="scaleToFill"></image>
 					</view>
 					<view class="con_image">
-						<image class="img" @click="navCroper(400,400,'serviceall')" src="../../../static/image/upImg.png">
+						<image class="img" @click="navCroper(400,400,'serviceall')"
+							src="../../../static/image/upImg.png">
 						</image>
 					</view>
 				</view>
@@ -366,7 +372,7 @@
 				jgList: AllAddress,
 				// 上传数据
 				updata: {
-					modelType:0,//模板类型0为老类型,1为纯图片
+					modelType: 0, //模板类型0为老类型,1为纯图片
 					is_global: 0, //是否全国0是否1是是
 					is_wm: '', //是否海外
 					avatar: '', //用户头像
@@ -421,8 +427,8 @@
 						title: '全国',
 						type: 3
 					}
-				], 
-				editorCtx: '',//保存详情页面数据
+				],
+				editorCtx: '', //保存详情页面数据
 				actionAreaType: 1
 			};
 		},
@@ -430,8 +436,8 @@
 			const that = this;
 			that.modelid = options.modelid
 			// 判断是否为隐藏赠送模板
-			if(that.modelid==6){
-				that.updata.modelType=1;
+			if (that.modelid == 6) {
+				that.updata.modelType = 1;
 			}
 			// console.log(that.modelid,'that.modelid')
 			if (options.type == 1) {
@@ -443,8 +449,8 @@
 		onReady() {
 			const that = this;
 			// 保存对象
-			if(that.modelid!=6){
-				this.$nextTick(()=>{
+			if (that.modelid != 6) {
+				this.$nextTick(() => {
 					uni.createSelectorQuery().select('#editor').context(async (res) => {
 						that.editorCtx = res.context
 						// console.log(that.editorCtx,'that.editorCtx');
@@ -454,12 +460,12 @@
 						that.init()
 					}).exec();
 				})
-			}else{
+			} else {
 				if (that.type == 1) {
-					 that.getUserCardInfo()
+					that.getUserCardInfo()
 				}
 			}
-			
+
 		},
 		computed: {
 			// #ifdef H5
@@ -647,7 +653,7 @@
 								const res = data.data;
 								// 存储返回用户数据
 								that.userModelData = res;
-								that.actionAreaType =res.is_china;
+								that.actionAreaType = res.is_china;
 								let onCity = [];
 								if (res.is_china == 1) {
 									for (let i = 0; i < res.service_area_all.length; i++) {
@@ -662,8 +668,8 @@
 									}
 								};
 								that.updata = Object.assign(that.updata, {
-									modelType:that.modelid==6?1:0,//保存模板类型
-									is_wm: res.is_china == 0 ? '是' : '否',//是否海外
+									modelType: that.modelid == 6 ? 1 : 0, //保存模板类型
+									is_wm: res.is_china == 0 ? '是' : '否', //是否海外
 									avatar: res.avatar, //用户头像
 									name: res.name, //用户名称
 									phone: res.mobile, //手机号
@@ -686,12 +692,12 @@
 									weight: res.weight * 1,
 									height: res.height
 								})
-								if(that.modelid!=6){
+								if (that.modelid != 6) {
 									that.editorCtx.setContents({
 										html: res.service_intro_content
 									})
 								}
-								
+
 								resolve('初始化数据成功')
 							} catch (e) {
 								console.log(e, 'eeee')
@@ -795,7 +801,7 @@
 										that.updata.service_imgs.splice(ind, 1, urldata.img)
 									} else if (type == 'serviceall') {
 										that.updata.service_imgs.push(urldata.img)
-									}else if (type == 'model') {
+									} else if (type == 'model') {
 										that.updata.model_imgs.splice(ind, 1, urldata.img)
 									} else if (type == 'modelall') {
 										that.updata.model_imgs.push(urldata.img)
@@ -812,6 +818,22 @@
 					})
 				})
 			},
+			upImage(name, type, ind) {
+				const that = this;
+				that.onImg(1).then((res) => {
+					console.log(res.tempFilePath,'res');
+					that.upLoad(res.tempFilePath).then((urldata) => {
+						console.log(urldata,'urldata');
+						if (type == 1) {
+							that.updata[name] = urldata.img
+						} else if (type == 2) {
+							that.updata[name].push(urldata.img)
+						} else if (type == 3) {
+							that.updata[name].splice(ind, 1, urldata.img)
+						}
+					})
+				})
+			},
 			onImg(type) {
 				const _this = this
 				return new Promise((ok, erro) => {
@@ -897,7 +919,7 @@
 				}
 				that.loding = true;
 				subInfoAudit({
-						modelType:that.updata.modelType,
+						modelType: that.updata.modelType,
 						is_china: that.actionAreaType,
 						avatar: that.updata.avatar,
 						name: that.updata.name,
@@ -950,7 +972,7 @@
 			// 认证
 			rendl() {
 				const that = this;
-				if(that.updata.modelType==0){
+				if (that.updata.modelType == 0) {
 					if (!that.updata.avatar) {
 						uni.showModal({
 							title: '错误',
@@ -959,7 +981,7 @@
 						});
 						return false
 					}
-					
+
 					if (!that.updata.name) {
 						uni.showModal({
 							title: '错误',
@@ -1039,7 +1061,7 @@
 						});
 						return false
 					}
-				}else if(that.updata.modelType==1){
+				} else if (that.updata.modelType == 1) {
 					if (that.updata.model_imgs.length == 0) {
 						uni.showModal({
 							title: '错误',
@@ -1211,14 +1233,16 @@
 		color: #F65486;
 		padding: 30rpx;
 	}
-	.table{
-		.table-text{
-			color:#F65486;
+
+	.table {
+		.table-text {
+			color: #F65486;
 			text-align: center;
 			flex-grow: 1;
 			padding: 30rpx;
 			border: 1px solid #F65486;
-			&.action{
+
+			&.action {
 				background-color: #F65486;
 				color: #FFFFFF;
 			}

+ 6 - 1
pages/userhome/user.vue

@@ -272,14 +272,19 @@
 		},
 		// 创建时获取分享信息
 		onLoad() {
+			console.log(11223344);
 			this.getGG();
 		},
 		onShow() {
+			console.log(112233);
 			this.getUser();
+			console.log(this.showGG,'this.showGG');
 			// 判断是否要显示广告弹窗
 			if(!this.showGG&&this.hasLogin&&this.ggList.length>0){
 				this.showGG=true;
-				this.$refs.popup.open()
+				this.$nextTick(()=>{
+					this.$refs.popup.open()
+				})
 			}
 		},
 		methods: {

+ 55 - 40
uni_modules/q-previewImage/package.json

@@ -5,10 +5,12 @@
   "description": "最简洁的模拟图片预览,支持长按事件,多图左右滑动,大图上下滑动查看,支持图片放大,支持覆盖原生组件/原生导航栏/tabbar  支持vue2/vue3/app/小程序/h5",
   "keywords": [
     "图片预览"
-],
+  ],
   "repository": "",
   "engines": {
-    "HBuilderX": "^3.6.13"
+    "HBuilderX": "^3.6.13",
+    "uni-app": "^3.1.0",
+    "uni-app-x": "^3.1.0"
   },
   "dcloudext": {
     "type": "component-vue",
@@ -28,53 +30,66 @@
       "data": "无",
       "permissions": "无"
     },
-    "npmurl": ""
+    "npmurl": "",
+    "darkmode": "-",
+    "i18n": "-",
+    "widescreen": "-"
   },
   "uni_modules": {
     "dependencies": [],
     "encrypt": [],
     "platforms": {
       "cloud": {
-        "tcb": "y",
-        "aliyun": "y",
-        "alipay": "n"
+        "tcb": "",
+        "aliyun": "",
+        "alipay": "x"
       },
       "client": {
-        "Vue": {
-          "vue2": "y",
-          "vue3": "y"
+        "uni-app": {
+          "vue": {
+            "vue2": "-",
+            "vue3": "-"
+          },
+          "web": {
+            "safari": "-",
+            "chrome": "-"
+          },
+          "app": {
+            "vue": "-",
+            "nvue": "-",
+            "android": "-",
+            "ios": "-",
+            "harmony": "-"
+          },
+          "mp": {
+            "weixin": "-",
+            "alipay": "-",
+            "toutiao": "-",
+            "baidu": "-",
+            "kuaishou": "-",
+            "jd": "-",
+            "harmony": "-",
+            "qq": "-",
+            "lark": "-"
+          },
+          "quickapp": {
+            "huawei": "-",
+            "union": "-"
+          }
         },
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "n"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "u",
-          "微信浏览器(Android)": "u",
-          "QQ浏览器(Android)": "u"
-        },
-        "H5-pc": {
-          "Chrome": "u",
-          "IE": "u",
-          "Edge": "u",
-          "Firefox": "u",
-          "Safari": "u"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "u",
-          "百度": "u",
-          "字节跳动": "u",
-          "QQ": "u",
-          "钉钉": "u",
-          "快手": "u",
-          "飞书": "u",
-          "京东": "u"
-        },
-        "快应用": {
-          "华为": "u",
-          "联盟": "u"
+        "uni-app-x": {
+          "web": {
+            "safari": "-",
+            "chrome": "-"
+          },
+          "app": {
+            "android": "-",
+            "ios": "-",
+            "harmony": "-"
+          },
+          "mp": {
+            "weixin": "-"
+          }
         }
       }
     }