temp save

src/components/Common/BaseForm.vue

@@ -160,7 +160,7 @@
         <el-upload
           class="img-upload"
           :disabled="item.disabled || false"
-          :action="`${requireUrl}/adm/upload/picture`"
+          :action="`${requireUrl}/adm/upload/cloud`"
           :data="{logic_type: 'estate', token}"
           name="upload"
           :show-file-list="false"
@@ -182,7 +182,7 @@
       >
         <el-upload
           :disabled="item.disabled || false"
-          :action="`${requireUrl}/adm/upload/picture`"
+          :action="`${requireUrl}/adm/upload/cloud`"
           :data="{filename: 'sysimg', token}"
           name="upload"
           :on-success="uploadSuccess2"
@@ -311,7 +311,6 @@
 </template>
 <script>
 import { strTrim } from '@/utils'
-import { constants } from 'os';
 export default {
   name: 'BaseForm',
   props: {
@@ -440,7 +439,8 @@ export default {
     uploadSuccess(res, file) {
       const data = res.data || {}
       const uploadItem = this.curData[this.curFormIndex]
-      this.baseForm[uploadItem.key] = `${data.domain}${data.url}?url=${data.url}&id=${data.file_id}`
+      // this.baseForm[uploadItem.key] = `${data.domain}${data.url}?url=${data.url}&id=${data.file_id}`
+      this.baseForm[uploadItem.key] = `${data.url}`
       // this.baseForm[uploadItem.key] = uploadItem.uploadData.domain + res.key
       // this.imageUrl = URL.createObjectURL(file.raw)
       this.changeHandle(file)

src/components/Common/TableList.vue

@@ -145,7 +145,7 @@
         >
           <template slot-scope="scope">
             <div v-if="noEmpty(scope.row[column.prop])" class="img-box" @click="bigImgHandle(scope.row[column.prop])">
-              <img :src="`${sysDomain}${scope.row[column.prop]}`" class="s-img">
+              <img :src="`${scope.row[column.prop]}`" class="s-img">
             </div>
             <span v-else>-</span>
           </template>
@@ -363,7 +363,7 @@
         @size-change="sizeChange"
       />
     </div>
-    <popup-big-img :is-show="bigImgShow" :src="`${sysDomain}${bigImgSrc}`" @close="closebigImg" />
+    <popup-big-img :is-show="bigImgShow" :src="`${bigImgSrc}`" @close="closebigImg" />
   </div>
 </template>
 <script>
@@ -418,9 +418,6 @@ export default {
     }
   },
   computed: {
-    sysDomain() {
-      return this.$store.state.user.sysDomain
-    },
     tableData() {
       const data = this.data || []
       data.map(item => {

src/views/house/components/popup/IndexEdit.vue

@@ -121,7 +121,6 @@ export default {
             if (curData.park_type) curData.park_type = curData.park_type.split(',')
             if (curData.metro_line) curData.metro_line = curData.metro_line.split(',')
             if (curData.metro_type) curData.metro_type = curData.metro_type.split(',')
-            curData.pri_image = `${curData.domain}${curData.pri_image}?url=${curData.pri_image}`
             this.cObj = curData || {}
             let productData = curData.area_data || []
             productData.map(one =>{
@@ -131,12 +130,6 @@ export default {
               houseTypeList.map(two => {
                 two.house_type_name = arrToObj(this.$dictData.house_type)[two.house_type_val]
                 one.house_type_list_val.push(String(two.house_type_val))
-                const areaList = two.area_list || []
-                areaList.map(three =>{
-                  if (three.img_url.indexOf(curData.domain) === -1) {
-                    three.img_url = `${curData.domain}${three.img_url}?url=${three.img_url}`
-                  }
-                })
               })
             })
             this.productData = [...productData]
@@ -314,16 +307,6 @@ export default {
             newForm.latitude = this.cObj.latitude
             if (!newForm.longitude) return this.$msgw('请选择经度！')
             else if (!newForm.latitude) return this.$msgw('请选择纬度！')
-            if (newForm.pri_image && newForm.pri_image.indexOf('?') > -1) {
-              const imgArr = newForm.pri_image.split('?')
-              const queryArr = imgArr[1].split('&')
-              queryArr.forEach(q =>{
-                const curQArr = q.split('=')
-                if (curQArr[0] === 'url') {
-                  newForm.pri_image = curQArr[1]
-                }
-              })
-            }
             if (newForm.house_type) newForm.house_type = newForm.house_type.join(',')
             if (newForm.product_type) newForm.product_type = newForm.product_type.join(',')
             if (newForm.hospital_type) newForm.hospital_type = newForm.hospital_type.join(',')
@@ -334,25 +317,6 @@ export default {
             let productData = this.productData || []
             newForm.custom_tag = newForm.custom_tag.replace('，', ',')
             newForm.stairs_rate = newForm.stairs_rate.replace('，', ',')
-
-            productData.map(one => {
-              const houseTypeList = one.house_type_list || []
-              houseTypeList.map(two => {
-                const areaList = two.area_list || []
-                areaList.map(three =>{
-                  if (three.img_url && three.img_url.indexOf('?') > -1) {
-                    const imgArr = three.img_url.split('?')
-                    const queryArr = imgArr[1].split('&')
-                    queryArr.forEach(q =>{
-                      const curQArr = q.split('=')
-                      if (curQArr[0] === 'url') {
-                        three.img_url = curQArr[1]
-                      }
-                    })
-                  }
-                })
-              })
-            })
             if (productData.length === 0) {
               newForm.area_data = ''
             } else {

src/views/house/components/popup/OldEdit.vue

@@ -79,11 +79,7 @@ export default {
           this.loading = true
           this.$api.house.admoldhousedetail({id: this.curObj.id}).then(res => {
             let curData = res || {}
-            if (curData.pri_image) curData.pri_image = `${curData.domain}${curData.pri_image}?url=${curData.pri_image}`
-            this.imagesArr = curData.images.split(',').map(img => {
-
-              return `${curData.domain}${img}?url=${img}`
-            })
+            this.imagesArr = curData.images.split(',')
             this.cObj = curData || {}
             this.getDef()
             this.loading = false
@@ -157,19 +153,8 @@ export default {
             newForm.latitude = this.cObj.latitude
             if (!newForm.longitude) return this.$msgw('请选择经度！')
             else if (!newForm.latitude) return this.$msgw('请选择纬度！')
-            // if (newForm.pri_image && newForm.pri_image.indexOf('?') > -1) {
-            //   const imgArr = newForm.pri_image.split('?')
-            //   const queryArr = imgArr[1].split('&')
-            //   queryArr.forEach(q =>{
-            //     const curQArr = q.split('=')
-            //     if (curQArr[0] === 'url') {
-            //       newForm.pri_image = curQArr[1]
-            //     }
-            //   })
-            // }
-            newForm.pri_image = this.getImgUrl(newForm.pri_image)
             const imgUrlArr = this.imagesArr.map(urlStr => {
-              return this.getImgUrl(urlStr)
+              return urlStr
             })
             newForm.images = imgUrlArr.join(',')
             let apiStr = 'admoldhouseadd'

src/views/news/components/popup/IndexEdit.vue

@@ -44,7 +44,6 @@ export default {
           if (this.curObj.id) {
             this.$api.house.adminformationdetail({id: this.curObj.id}).then(res => {
               let curData = res || {}
-              if (curData.pri_image) curData.pri_image = `${curData.domain}${curData.pri_image}?url=${curData.pri_image}`
               this.cObj = curData || {}
               this.getDef()
             })
@@ -96,18 +95,6 @@ export default {
             } else {
               newForm.estate_id_list = ''
             }
-            if (newForm.pri_image && newForm.pri_image.indexOf('?') > -1) {
-              const imgArr = newForm.pri_image.split('?')
-              const queryArr = imgArr[1].split('&')
-              queryArr.forEach(q =>{
-                const curQArr = q.split('=')
-                if (curQArr[0] === 'url') {
-                  newForm.pri_image = curQArr[1]
-                }
-              })
-            } else {
-              delete newForm.pri_image
-            }
             let apiStr = 'adminformationadd'
             if (newForm.id) apiStr = 'adminformationedit'
             this.$api.house[apiStr](newForm).then(data => {

src/views/school/components/popup/IndexEdit.vue

@@ -53,7 +53,6 @@ export default {
           if (this.curObj.id) {
             this.$api.house.admschooldetail({id: this.curObj.id}).then(res => {
               let curData = res || {}
-              curData.pri_image = `${curData.domain}${curData.pri_image}?url=${curData.pri_image}`
               this.cObj = curData || {}
               this.getDef()
             })
@@ -109,16 +108,6 @@ export default {
             newForm.latitude = this.cObj.latitude
             if (!newForm.longitude) return this.$msgw('请选择经度！')
             else if (!newForm.latitude) return this.$msgw('请选择纬度！')
-            if (newForm.pri_image && newForm.pri_image.indexOf('?') > -1) {
-              const imgArr = newForm.pri_image.split('?')
-              const queryArr = imgArr[1].split('&')
-              queryArr.forEach(q =>{
-                const curQArr = q.split('=')
-                if (curQArr[0] === 'url') {
-                  newForm.pri_image = curQArr[1]
-                }
-              })
-            }
             let apiStr = 'admschooladd'
             if (newForm.id) apiStr = 'admschooledit'
             this.$api.house[apiStr](newForm).then(data => {

src/views/user/components/popup/IndexEdit.vue

@@ -47,7 +47,6 @@ export default {
   methods: {
     getDef() {
       const params = { ...this.curObj }
-      if (params.avatar) params.avatar = `${params.domain}${params.avatar}?url=${params.avatar}`
       const disabled = false
       this.formData = [
         { label: '账号', key: 'username', rules: 1 },
@@ -64,16 +63,6 @@ export default {
           if (valid) {
             const oldform = this.$refs.ruleForm.baseForm
             const newForm = { ...oldform }
-            if (newForm.avatar && newForm.avatar.indexOf('?') > -1) {
-              const imgArr = newForm.avatar.split('?')
-              const queryArr = imgArr[1].split('&')
-              queryArr.forEach(q =>{
-                const curQArr = q.split('=')
-                if (curQArr[0] === 'url') {
-                  newForm.avatar = curQArr[1]
-                }
-              })
-            }
             if (this.curObj.id) newForm.id = this.curObj.id
             this.$emit('close', newForm)
           }