From 7c33a1164d3019feb3ad9e4844b3d364e5c6eb44 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 17 十一月 2024 11:31:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

---
 ruoyi-ui/src/views/pet/petInfo.vue |   61 +++++++++++++++++++++++-------
 1 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/ruoyi-ui/src/views/pet/petInfo.vue b/ruoyi-ui/src/views/pet/petInfo.vue
index 00d936b..4f5c950 100644
--- a/ruoyi-ui/src/views/pet/petInfo.vue
+++ b/ruoyi-ui/src/views/pet/petInfo.vue
@@ -566,11 +566,11 @@
       this.isShow = true
 
      // document.title = "淇敼榄呭疇璇︾粏淇℃伅";
-      this.$route.meta.title = "淇敼榄呭疇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+      this.$route.meta.title = "淇敼瀹犵墿璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
     }
     else{
      // document.title = "鏌ョ湅榄呭疇璇︾粏淇℃伅";
-      this.$route.meta.title = "鏌ョ湅榄呭疇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+      this.$route.meta.title = "鏌ョ湅瀹犵墿璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
       this.btn = false;
       this.isShow = false;
     }
@@ -615,21 +615,23 @@
       );
     },
 
-    requestUpload2(params)
-    {
-      var file = params.file;
-      var formData = new FormData();
+    // requestUpload2(params)
+    // {
+    //   var file = params.file;
+    //   var formData = new FormData();
 
-      formData.append('uploadFile', file);
-      let _this = this
+    //   formData.append('uploadFile', file);
+    //   let _this = this
 
-      uploadPic1(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        _this.fileList2.push({name:response.data.fileName, url:response.data.url})
-        console("ok")
-      })
 
-    },
+    //   uploadPic1(formData).then(response => {
+    //     let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+    //     _this.fileList2.push({name:response.data.fileName, url:response.data.url})
+    //     console("ok")
+    //   })
+
+
+    // },
     submitForm() {
 
       // let ul = this.fileList1.map(function (elem){
@@ -645,13 +647,25 @@
 
           if (valid) {
             if (this.petList.id != undefined) {
+              if(this.petList.sex=='闆勬��')
+              	this.petList.sex = 1
+              else
+              	this.petList.sex = 0
               updatePet(this.petList).then(response => {
                 this.$modal.msgSuccess("淇敼鎴愬姛");
                 // this.open = false;
+                if(this.petList.sex==1)
+                	this.petList.sex = '闆勬��'
+                else
+                	this.petList.sex = '闆屾��'
                 this.btn=false
               });
             } else {
               this.$modal.msgSuccess("淇敼澶辫触");
+              if(this.petList.sex==1)
+              	this.petList.sex = '闆勬��'
+              else
+              	this.petList.sex = '闆屾��'
 
             }
           }
@@ -764,18 +778,28 @@
    //   console("ok")
     //  alert(90)
     //  alert(response.data.url)
+    if(this.petList.sex=='闆勬��')
+    	this.petList.sex = 1
+    else
+    	this.petList.sex = 0
       _this.petList.fullPicture =  response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
       updatePet(_this.petList).then(response => {
         _this.$modal.msgSuccess("鍥惧儚淇敼鎴愬姛");
+        if(this.petList.sex==1)
+        	this.petList.sex = '闆勬��'
+        else
+        	this.petList.sex = '闆屾��'
         // this.open = false;
         _this.btn=false
       });
      // alert(100)
     })
+
       //alert(90)
      },
 requestUpload1(params)
     {
+
       var file = params.file;
       var formData = new FormData();
       formData.append('uploadFile', file);
@@ -791,14 +815,23 @@
    //   console("ok")
     //  alert(90)
     //  alert(response.data.url)
+    if(this.petList.sex=='闆勬��')
+    	this.petList.sex = 1
+    else
+    	this.petList.sex = 0
       _this.petList.headPicture =  response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
       updatePet(_this.petList).then(response => {
         _this.$modal.msgSuccess("淇敼鎴愬姛");
         // this.open = false;
+        if(this.petList.sex==1)
+        	this.petList.sex = '闆勬��'
+        else
+        	this.petList.sex = '闆屾��'
         _this.btn=false
       });
      // alert(100)
     })
+
       //alert(90)
      },
 

--
Gitblit v1.9.1