feat:发布

package-lock.json

@@ -3971,6 +3971,28 @@
       "resolved": "https://registry.npmmirror.com/aws4/-/aws4-1.11.0.tgz",
       "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
     },
+    "axios": {
+      "version": "1.6.0",
+      "resolved": "http://121.41.110.30:4873/axios/-/axios-1.6.0.tgz",
+      "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==",
+      "requires": {
+        "follow-redirects": "^1.15.0",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
+      },
+      "dependencies": {
+        "form-data": {
+          "version": "4.0.0",
+          "resolved": "http://121.41.110.30:4873/form-data/-/form-data-4.0.0.tgz",
+          "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.8",
+            "mime-types": "^2.1.12"
+          }
+        }
+      }
+    },
     "babel-jest": {
       "version": "25.5.1",
       "resolved": "https://registry.npmmirror.com/babel-jest/-/babel-jest-25.5.1.tgz",
@@ -4920,7 +4942,7 @@
     },
     "charenc": {
       "version": "0.0.2",
-      "resolved": "http://121.41.110.30:4873/charenc/-/charenc-0.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/charenc/-/charenc-0.0.2.tgz",
       "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA=="
     },
     "check-types": {
@@ -5753,7 +5775,7 @@
     },
     "crypt": {
       "version": "0.0.2",
-      "resolved": "http://121.41.110.30:4873/crypt/-/crypt-0.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/crypt/-/crypt-0.0.2.tgz",
       "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow=="
     },
     "crypto-browserify": {
@@ -7259,8 +7281,7 @@
     "follow-redirects": {
       "version": "1.15.2",
       "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
-      "dev": true
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
     },
     "for-in": {
       "version": "1.0.2",
@@ -10435,7 +10456,7 @@
     },
     "js-perform-lock": {
       "version": "1.0.5",
-      "resolved": "http://121.41.110.30:4873/js-perform-lock/-/js-perform-lock-1.0.5.tgz",
+      "resolved": "https://registry.npmmirror.com/js-perform-lock/-/js-perform-lock-1.0.5.tgz",
       "integrity": "sha512-aDp38fxLnur2YMsJhw1Ab23PdwceXMU5Pkcb4R5MSaRfySiDwbDR2L/ysnB4X7/1XERkLC56r32qwtNlitBSGg=="
     },
     "js-tokens": {
@@ -11159,7 +11180,7 @@
     },
     "md5": {
       "version": "2.3.0",
-      "resolved": "http://121.41.110.30:4873/md5/-/md5-2.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/md5/-/md5-2.3.0.tgz",
       "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
       "requires": {
         "charenc": "0.0.2",
@@ -13192,6 +13213,11 @@
         "ipaddr.js": "1.9.1"
       }
     },
+    "proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "http://121.41.110.30:4873/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
     "prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/prr/-/prr-1.0.1.tgz",
@@ -16951,7 +16977,7 @@
     },
     "weixin-js-sdk": {
       "version": "1.6.3",
-      "resolved": "http://121.41.110.30:4873/weixin-js-sdk/-/weixin-js-sdk-1.6.3.tgz",
+      "resolved": "https://registry.npmmirror.com/weixin-js-sdk/-/weixin-js-sdk-1.6.3.tgz",
       "integrity": "sha512-5jYNtVcxWmgHNqCLSPoX6vXab9G4RPDZx0klX8IsVwGjDTwx/UDmgfF7fkRMGguRpuFv0O7tk1jb+Oay2QiV1w=="
     },
     "whatwg-encoding": {

package.json

@@ -99,6 +99,7 @@
     "@dcloudio/uni-stacktracey": "^2.0.1-alpha-36920221114001",
     "@dcloudio/uni-stat": "^2.0.1-alpha-36920221114001",
     "@vue/shared": "^3.0.0",
+    "axios": "^1.6.0",
     "core-js": "^3.6.5",
     "flyio": "^0.6.2",
     "js-base64": "^3.7.2",

src/components/zj-upload/index.vue

@@ -24,6 +24,8 @@
 </template>
 
 <script>
+import store from '@/store/index.js'
+import axios from 'axios'
 // import { upload } from "@/common/http/upload-file.js";
 import api from '@/common/http/'
 import { uploadImgs } from '@/common/utils/util.js'
@@ -72,7 +74,27 @@ export default {
       if (!url) return ''
       const fileSuffix = url.substring(url.lastIndexOf('.') + 1)
 
-      if (['jpg', 'jpeg', 'png'].includes(fileSuffix)) {
+      if (
+        [
+          'jpg',
+          'jpeg',
+          'png',
+          'cdr',
+          'bmp',
+          'dip',
+          'pcp',
+          'dif',
+          'wmf',
+          'gif',
+          'tif',
+          'eps',
+          'psd',
+          'iff',
+          'tga',
+          'pcd',
+          'mpt'
+        ].includes(fileSuffix)
+      ) {
         return 'image'
       } else if (['doc', 'docx', 'dot', 'wps', 'wpt'].includes(fileSuffix)) {
         return 'word'
@@ -105,18 +127,52 @@ export default {
     upload() {
       uni.chooseImage({
         // count: this.count === 0 ? 0 : this.count - this.files.length,
-        count:1,
+        count: 1,
         success: async res => {
+          console.log(res)
           let pathType = this.checkFileType(res.tempFiles[0].name)
           if (pathType !== 'image') {
             return this.$toast('当前格式仅支持jpg, jpeg, png，请检查')
           }
           //  #ifdef H5
-          uploadImgs(res.tempFiles[0]).then(res => {
-            this.files.push({
-              url: res.url
+          // 获取选择的文件路径
+          // console.log(store,898989);
+          let phone = '17839905442'
+          phone = phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2')
+
+          const formData = new FormData()
+          formData.append('positionName', phone)
+          formData.append('file', res.tempFiles[0])
+          // 配置axios请求参数
+          const config = {
+            method: 'post',
+            url: process.env.VUE_APP_BASE_URL + process.env.VUE_APP_BASE_API + '/common/image/generate/watermark', // 上传文件的服务器地址
+            data: formData,
+            headers: {
+              'Content-Type': 'multipart/form-data',
+              'X-Token': store.getters.token
+            }
+          }
+
+          // 发送上传请求
+          axios(config)
+            .then(response => {
+              // 处理上传成功的响应数据
+              this.files.push({
+                url: response.data.data
+              })
+              console.log(response.data)
             })
-          })
+            .catch(error => {
+              // 处理上传失败的错误
+              console.error(error)
+            })
+
+          // uploadImgs(res.tempFiles[0]).then(res => {
+          //   this.files.push({
+          //     url: res.url
+          //   })
+          // })
           //  #endif
 
           // #ifdef MP-WEIXIN

src/pages/issue/index.vue

@@ -24,12 +24,21 @@
         <u-form-item label="商品图片" prop="" required borderBottom ref="item1">
           <zj-upload key="cp" @getFiles="getFiles" :fileList="fileList" :count="9" />
         </u-form-item>
-        <u-form-item labelPosition="left" required label="商品分类" prop="categoryId" borderBottom ref="item1">
-          <u-radio-group v-model="form.categoryId" placement="column">
-            <u-radio v-for="(v, i) in categoryList" :key="i" :customStyle="{ marginBottom: '8px' }"
-              :label="v.categoryName" :name="v.categoryId">
-            </u-radio>
-          </u-radio-group>
+        <u-form-item style="" labelPosition="left" required label="商品分类" prop="categoryId" borderBottom ref="item1">
+          <view style="flex: 1; display: flex; justify-content: flex-end">
+            <view>
+              <u-radio-group iconPlacement="left" v-model="form.categoryId" placement="column">
+                <u-radio
+                  v-for="(v, i) in categoryList"
+                  :key="i"
+                  :customStyle="{ marginBottom: '8px' }"
+                  :label="v.categoryName"
+                  :name="v.categoryId"
+                >
+                </u-radio>
+              </u-radio-group>
+            </view>
+          </view>
         </u-form-item>
         <u-form-item label="所在位置" labelPosition="left" prop="address" required borderBottom ref="item1">
           <view @click="handleDW" class="letText">
@@ -45,17 +54,31 @@
           <u--input v-model="form.num" inputAlign="right" placeholder="请输入" border="none"></u--input>
         </u-form-item>
         <u-form-item label="商品品牌" labelPosition="left" prop="brand" borderBottom ref="item1">
-          <u--input v-model="form.brand" inputAlign="right" placeholder="请输入（如格力、美的）" border="none"></u--input>
+          <u--input
+            v-model="form.brand"
+            inputAlign="right"
+            placeholder="请输入（如格力、美的）"
+            border="none"
+          ></u--input>
         </u-form-item>
         <u-form-item label="功率（W）" labelPosition="left" prop="power" borderBottom ref="item1">
           <u--input v-model="form.power" inputAlign="right" placeholder="请输入" border="none"></u--input>
         </u-form-item>
         <u-form-item labelPosition="left" label="能效标识" prop="energy" borderBottom ref="item1">
-          <u-radio-group v-model="form.energy" placement="column">
-            <u-radio v-for="(v, i) in dictList" :key="i" :customStyle="{ marginBottom: '8px' }" :label="v.dictValue"
-              :name="v.dictValue">
-            </u-radio>
-          </u-radio-group>
+          <view style="flex: 1; display: flex; justify-content: flex-end">
+            <view>
+              <u-radio-group v-model="form.energy" placement="column">
+                <u-radio
+                  v-for="(v, i) in dictList"
+                  :key="i"
+                  :customStyle="{ marginBottom: '8px' }"
+                  :label="v.dictValue"
+                  :name="v.dictValue"
+                >
+                </u-radio>
+              </u-radio-group>
+            </view>
+          </view>
         </u-form-item>
         <u-form-item label="制造日期" labelPosition="left" prop="goodsCreateTime" borderBottom ref="item1">
           <view class="letText" @click="handleTime">
@@ -72,403 +95,421 @@
         <u-button :disabled="disabled" @click="submin" text="发布" color="#5298ff" shape="circle"></u-button>
       </view>
     </view>
-    <u-datetime-picker @cancel="handleCancelTime" @confirm="handleConfirmTime" :show="showTime" v-model="time"
-      mode="year-month"></u-datetime-picker>
+    <u-datetime-picker
+      @cancel="handleCancelTime"
+      @confirm="handleConfirmTime"
+      :show="showTime"
+      v-model="time"
+      mode="year-month"
+    ></u-datetime-picker>
   </view>
   <!-- #endif -->
   <!-- #ifndef H5 -->
   <view>
-    <web-view v-if="isShow" :src="webViewHref('/pages/issue/index', pam,crossPagePam)"
-      @message="crossPage.$listener"></web-view>
+    <web-view
+      v-if="isShow"
+      :src="webViewHref('/pages/issue/index', pam, crossPagePam)"
+      @message="crossPage.$listener"
+    ></web-view>
   </view>
   <!-- #endif -->
 </template>
 
 <script>
-  import zjUpload from '@/components/zj-upload/index.vue'
-  export default {
-    // #ifndef H5
-    data() {
-      return {
-        isShow: false,
-        pam: {},
-        init: true
-      }
-    },
-
-    onShow() {
-      this.pam = uni.getStorageSync('issuePageParam')
-      uni.removeStorageSync('issuePageParam');
+import zjUpload from '@/components/zj-upload/index.vue'
+export default {
+  // #ifndef H5
+  data() {
+    return {
+      isShow: false,
+      pam: {},
+      init: true
+    }
+  },
 
-      if (this.pam.isLoad || this.init) {
-        this.init = false
-        delete this.pam.isLoad
-        this.isShow = false
-        this.$nextTick(() => {
-          this.isShow = true
-        })
-      }
+  onShow() {
+    this.pam = uni.getStorageSync('issuePageParam')
+    uni.removeStorageSync('issuePageParam');
 
+    if (this.pam.isLoad || this.init) {
+      this.init = false
+      delete this.pam.isLoad
+      this.isShow = false
+      this.$nextTick(() => {
+        this.isShow = true
+      })
     }
-    // #endif
 
+  }
+  // #endif
 
-    // #ifdef H5
-    components: {
-      zjUpload
-    },
-    data() {
-      return {
-        disabled: false,
-        showTime: false,
-        show: true,
-        form: {
-          title: '',
-          content: '',
-          categoryName: '',
-          categoryId: '',
-          lng: '',
-          lat: '',
-          address: '',
-          amount: '',
-          num: '',
-          brand: '',
-          power: '',
-          energy: '',
-          province: '',
-          city: '',
-          area: '',
-          street: '',
-          goodsCreateTime: ''
-        },
-        rules: {
-          title: [{
-            required: true,
-            message: '必传',
-            trigger: ['change', 'blur']
-          }],
-          content: [{
+
+  // #ifdef H5
+  components: {
+    zjUpload
+  },
+  data() {
+    return {
+      disabled: false,
+      showTime: false,
+      show: true,
+      form: {
+        title: '',
+        content: '',
+        categoryName: '',
+        categoryId: '',
+        lng: '',
+        lat: '',
+        address: '',
+        amount: '',
+        num: '',
+        brand: '',
+        power: '',
+        energy: '',
+        province: '',
+        city: '',
+        area: '',
+        street: '',
+        goodsCreateTime: ''
+      },
+      rules: {
+        title: [{
+          required: true,
+          message: '必传',
+          trigger: ['change', 'blur']
+        }],
+        content: [{
+          required: true,
+          message: '必传',
+          trigger: ['change', 'blur']
+        }],
+        categoryId: [{
+          required: true,
+          message: '必传',
+          trigger: ['change', 'blur']
+        }],
+        address: [{
+          required: true,
+          message: '必传',
+          trigger: ['change', 'blur']
+        }],
+        amount: [{
             required: true,
             message: '必传',
             trigger: ['change', 'blur']
-          }],
-          categoryId: [{
-            required: true,
-            message: '必传',
+          },
+          {
+            pattern: /^\d+\.?\d*$/g,
+            // 正则检验前先将值转为字符串
+            transform(value) {
+              return String(value)
+            },
+            message: '格式不正确',
             trigger: ['change', 'blur']
-          }],
-          address: [{
+          }
+        ],
+        num: [{
             required: true,
             message: '必传',
             trigger: ['change', 'blur']
-          }],
-          amount: [{
-              required: true,
-              message: '必传',
-              trigger: ['change', 'blur']
+          },
+          {
+            pattern: /^\d+$/g,
+            // 正则检验前先将值转为字符串
+            transform(value) {
+              return String(value)
             },
-            {
-              pattern: /^\d+\.?\d*$/g,
-              // 正则检验前先将值转为字符串
-              transform(value) {
-                return String(value)
-              },
-              message: '格式不正确',
-              trigger: ['change', 'blur']
-            }
-          ],
-          num: [{
-              required: true,
-              message: '必传',
-              trigger: ['change', 'blur']
-            },
-            {
-              pattern: /^\d+$/g,
-              // 正则检验前先将值转为字符串
-              transform(value) {
-                return String(value)
-              },
-              message: '格式不正确',
-              trigger: ['change', 'blur']
-            }
-          ]
-        },
-        time: Number(new Date()),
-        categoryList: [],
-        dictList: [],
-        fileList: [],
-        fileurl: [],
-        content: '',
-        type: '',
-        goodsId: ''
-      }
-    },
-    onReady() {
-      //如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
-      // this.$refs.form.setRules(this.rules)
-    },
-    onLoad({
-      type,
-      goodsId
-    }) {
-      console.log(type, goodsId)
-      this.type = type
-      this.goodsId = goodsId
-      if (goodsId) {
-        this.show = false
-        this.getDetail()
+            message: '格式不正确',
+            trigger: ['change', 'blur']
+          }
+        ]
+      },
+      time: Number(new Date()),
+      categoryList: [],
+      dictList: [],
+      fileList: [],
+      fileurl: [],
+      content: '',
+      type: '',
+      goodsId: ''
+    }
+  },
+  onReady() {
+    //如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
+    // this.$refs.form.setRules(this.rules)
+  },
+  onLoad({
+    type,
+    goodsId
+  }) {
+    console.log(type, goodsId)
+    this.type = type
+    this.goodsId = goodsId
+    if (goodsId) {
+      this.show = false
+      this.getDetail()
+    }
+  },
+  onShow() {
+    // const value = uni.getStorageSync('issuePageParam')
+    // if (value) {
+    //   this.type = value.type
+    //   this.goodsId = value.goodsId
+    //   this.show = false
+    //   this.getDetail()
+    //   uni.removeStorageSync('issuePageParam');
+    // }
+    this.getConfig()
+    this.getList()
+    this.getDictList()
+  },
+  watch: {
+    'form.address': {
+      handler(nl) {
+        this.$refs.form.clearValidate('address')
       }
+    }
+  },
+  methods: {
+    //
+    getDetail() {
+      this.$api
+        .postJson('/goods/detail', {
+          id: this.goodsId
+        })
+        .then(res => {
+          console.log(res)
+          this.form = {
+            title: res.data.title,
+            content: res.data.content,
+            categoryName: res.data.categoryName,
+            categoryId: res.data.categoryId,
+            lng: res.data.lng,
+            lat: res.data.lat,
+            address: res.data.address,
+            amount: String(res.data.amount),
+            num: String(res.data.num),
+            brand: res.data.brand,
+            power: res.data.power,
+            energy: res.data.energy,
+            province: res.data.province,
+            city: res.data.city,
+            area: res.data.area,
+            street: res.data.street,
+            goodsCreateTime: res.data.goodsCreateTime
+          }
+          this.fileList = res.data.goodsFiles.map(v => v.imgUrl)
+          this.fileurl = []
+          res.data.goodsFiles.forEach(v => {
+            this.fileurl.push({
+              imgUrl: v.imgUrl
+            })
+          })
+        })
+        .catch(() => {})
     },
-    onShow() {
-      // const value = uni.getStorageSync('issuePageParam')
-      // if (value) {
-      //   this.type = value.type
-      //   this.goodsId = value.goodsId
-      //   this.show = false
-      //   this.getDetail()
-      //   uni.removeStorageSync('issuePageParam');
-      // }
-      this.getConfig()
-      this.getList()
-      this.getDictList()
+    getConfig() {
+      this.$api
+        .get('/app/config/detail-by-type', {
+          configType: '4'
+        })
+        .then(res => {
+          this.content = res.data.content
+        })
+        .catch(() => {})
     },
-    watch: {
-      'form.address': {
-        handler(nl) {
-          this.$refs.form.clearValidate('address')
-        }
-      }
+    getFiles(value) {
+      this.fileurl = []
+      value.forEach(v => {
+        this.fileurl.push({
+          imgUrl: v
+        })
+      })
     },
-    methods: {
-      //
-      getDetail() {
-        this.$api
-          .postJson('/goods/detail', {
-            id: this.goodsId
-          })
-          .then(res => {
-            console.log(res)
-            this.form = {
-              title: res.data.title,
-              content: res.data.content,
-              categoryName: res.data.categoryName,
-              categoryId: res.data.categoryId,
-              lng: res.data.lng,
-              lat: res.data.lat,
-              address: res.data.address,
-              amount: String(res.data.amount),
-              num: String(res.data.num),
-              brand: res.data.brand,
-              power: res.data.power,
-              energy: res.data.energy,
-              province: res.data.province,
-              city: res.data.city,
-              area: res.data.area,
-              street: res.data.street,
-              goodsCreateTime: res.data.goodsCreateTime
+    submin() {
+      this.$refs.form
+        .validate()
+        .then(valid => {
+          if (valid) {
+            this.disabled = true
+            this.form.categoryName =
+              this.categoryList.find(v => v.categoryId === this.form.categoryId)?.categoryName ?? ''
+            let params = {
+              ...this.form,
+              goodsFiles: this.fileurl
             }
-            this.fileList = res.data.goodsFiles.map(v => v.imgUrl)
-            this.fileurl = []
-            res.data.goodsFiles.forEach(v => {
-              this.fileurl.push({
-                imgUrl: v.imgUrl
-              })
-            })
-          })
-          .catch(() => {})
-      },
-      getConfig() {
-        this.$api
-          .get('/app/config/detail-by-type', {
-            configType: '4'
-          })
-          .then(res => {
-            this.content = res.data.content
-          })
-          .catch(() => {})
-      },
-      getFiles(value) {
-        this.fileurl = []
-        value.forEach(v => {
-          this.fileurl.push({
-            imgUrl: v
-          })
-        })
-      },
-      submin() {
-        this.$refs.form
-          .validate()
-          .then(valid => {
-            if (valid) {
-              this.disabled = true
-              this.form.categoryName =
-                this.categoryList.find(v => v.categoryId === this.form.categoryId)?.categoryName ?? ''
-              let params = {
-                ...this.form,
-                goodsFiles: this.fileurl
+            this.$toast('正在发布中，请稍后')
+            setTimeout(() => {
+              let path = '/goods/add'
+              if (this.goodsId && this.type == 1) {
+                path = '/goods/updateUp'
+                params.id = this.goodsId
               }
-              this.$toast('正在发布中，请稍后')
-              setTimeout(() => {
-                let path = '/goods/add'
-                if (this.goodsId && this.type == 1) {
-                  path = '/goods/updateUp'
-                  params.id = this.goodsId
-                }
-                if (this.goodsId && this.type == 2) {
-                  path = '/goods/update'
-                  params.id = this.goodsId
-                }
-                this.$api
-                  .post(path, params)
-                  .then(res => {
-                    this.form = {
-                      title: '',
-                      content: '',
-                      categoryName: '',
-                      categoryId: '',
-                      lng: '',
-                      lat: '',
-                      address: '',
-                      amount: '',
-                      num: '',
-                      brand: '',
-                      power: '',
-                      province: '',
-                      city: '',
-                      area: '',
-                      street: '',
-                      energy: '',
-                      goodsCreateTime: ''
-                    }
-                    this.$refs.form.clearValidate()
-                    this.disabled = false
-                    this.show = true
-                    this.$navToPage({
-                        url: '/pages/index/index'
-                      },
-                      'switchTab'
-                    )
-                  })
-                  .catch(err => {
-                    this.disabled = false
-                    // this.$toast(err)
-                  })
-              }, 1000)
-            }
-          })
-          .catch(err => {
-            this.$toast('缺少必要参数，请检查')
-          })
-
-        return
-      },
-      //获取商品分类数据
-      async getList() {
-        this.$api
-          .get('/goods/category/list')
-          .then(res => {
-            this.categoryList = res.data
-          })
-          .catch(() => {})
-      },
-      //获取能效数据
-      async getDictList() {
-        this.$api
-          .get('/goods/dict', {
-            dictCode: '能效'
-          })
-          .then(res => {
-            this.dictList = res.data
-          })
-          .catch(() => {})
-      },
-      handleDW() {
-        uni.chooseLocation({
-          success: res => {
-            this.form.lng = res.longitude
-            this.form.lat = res.latitude
-            this.form.address = res.address
-            this.$api
-              .post(`/lbs/amap/region/query?lng=${res.longitude}&lat=${res.latitude}`)
-              .then(res => {
-                console.log(res)
-                this.form.province = res.data.provinceName
-                this.form.city = res.data.cityName
-                this.form.area = res.data.areaName
-                this.form.street = res.data.name
-              })
-              .catch(() => {})
+              if (this.goodsId && this.type == 2) {
+                path = '/goods/update'
+                params.id = this.goodsId
+              }
+              this.$api
+                .post(path, params)
+                .then(res => {
+                  this.form = {
+                    title: '',
+                    content: '',
+                    categoryName: '',
+                    categoryId: '',
+                    lng: '',
+                    lat: '',
+                    address: '',
+                    amount: '',
+                    num: '',
+                    brand: '',
+                    power: '',
+                    province: '',
+                    city: '',
+                    area: '',
+                    street: '',
+                    energy: '',
+                    goodsCreateTime: ''
+                  }
+                  this.$refs.form.clearValidate()
+                  this.disabled = false
+                  this.show = true
+                  this.crossPage.$emit('reloadHomePage');
+                  this.$navToPage({
+                      url: '/pages/index/index'
+                    },
+                    'switchTab'
+                  )
+                })
+                .catch(err => {
+                  this.disabled = false
+                  // this.$toast(err)
+                })
+            }, 1000)
           }
         })
-      },
-      handleConfirmTime(value) {
-        const date = new Date(value.value) // JavaScript的Date对象使用的是毫秒时间戳，因此需要将Unix时间戳乘以1000
-        const year = date.getFullYear()
-        const month = String(date.getMonth() + 1).padStart(2, '0') // getMonth()返回的月份是从0开始的，因此需要加1，然后使用padStart()添加前导零
-        const day = String(date.getDate()).padStart(2, '0')
-        const hours = String(date.getHours()).padStart(2, '0')
-        const minutes = String(date.getMinutes()).padStart(2, '0')
-        const seconds = String(date.getSeconds()).padStart(2, '0')
+        .catch(err => {
+          this.$toast('缺少必要参数，请检查')
+        })
 
-        let res = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
-        let res2 = `${year}-${month}`
-        this.form.goodsCreateTime = res
-        this.time = res2
-        this.showTime = false
-      },
-      handleCancelTime() {
-        this.showTime = false
-      },
-      handleTime() {
-        this.showTime = true
-      },
-      handleAgree() {
-        this.show = false
-      }
+      return
+    },
+    //获取商品分类数据
+    async getList() {
+      this.$api
+        .get('/goods/category/list')
+        .then(res => {
+          this.categoryList = res.data
+        })
+        .catch(() => {})
+    },
+    //获取能效数据
+    async getDictList() {
+      this.$api
+        .get('/goods/dict', {
+          dictCode: '能效'
+        })
+        .then(res => {
+          this.dictList = res.data
+        })
+        .catch(() => {})
+    },
+    handleDW() {
+      uni.chooseLocation({
+        success: res => {
+          this.form.lng = res.longitude
+          this.form.lat = res.latitude
+          this.form.address = res.address
+          this.$api
+            .post(`/lbs/amap/region/query?lng=${res.longitude}&lat=${res.latitude}`)
+            .then(res => {
+              console.log(res)
+              this.form.province = res.data.provinceName
+              this.form.city = res.data.cityName
+              this.form.area = res.data.areaName
+              this.form.street = res.data.name
+            })
+            .catch(() => {})
+        }
+      })
+    },
+    handleConfirmTime(value) {
+      const date = new Date(value.value) // JavaScript的Date对象使用的是毫秒时间戳，因此需要将Unix时间戳乘以1000
+      const year = date.getFullYear()
+      const month = String(date.getMonth() + 1).padStart(2, '0') // getMonth()返回的月份是从0开始的，因此需要加1，然后使用padStart()添加前导零
+      const day = String(date.getDate()).padStart(2, '0')
+      const hours = String(date.getHours()).padStart(2, '0')
+      const minutes = String(date.getMinutes()).padStart(2, '0')
+      const seconds = String(date.getSeconds()).padStart(2, '0')
+
+      let res = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
+      let res2 = `${year}-${month}`
+      this.form.goodsCreateTime = res
+      this.time = res2
+      this.showTime = false
+    },
+    handleCancelTime() {
+      this.showTime = false
+    },
+    handleTime() {
+      this.showTime = true
+    },
+    handleAgree() {
+      this.show = false
     }
-    // #endif
   }
+  // #endif
+}
 </script>
 
 <style lang="scss" scoped>
-  .contentXZ {
-    padding: 20px;
-  }
+.contentXZ {
+  padding: 20px;
+}
 
-  .pop {
-    overflow: auto;
-    //   padding: 0 20rpx;
-    /* #ifdef H5 */
-    // height: calc(100vh - 44px);
-    height: 100vh;
-    /* #endif */
-    /* #ifndef H5 */
-    height: 100vh;
-    /* #endif */
+::v-deep .rig {
+  .u-form-item__body {
+    justify-content: space-between;
+    .u-form-item__body {
+      flex: none;
+    }
   }
+}
 
-  .content {
-    padding: 0 40rpx;
-    margin: 20rpx 0;
-    //   height: calc(100vh - 44px);
-    background-color: #fff;
-  }
+.pop {
+  overflow: auto;
+  //   padding: 0 20rpx;
+  /* #ifdef H5 */
+  // height: calc(100vh - 44px);
+  height: 100vh;
+  /* #endif */
+  /* #ifndef H5 */
+  height: 100vh;
+  /* #endif */
+}
 
-  .bottom-container {
-    position: fixed;
-    bottom: 0;
-    width: 100%;
-    background-color: #f1f1f1;
-    padding: 18px 0;
-  }
+.content {
+  padding: 0 40rpx;
+  margin: 20rpx 0;
+  //   height: calc(100vh - 44px);
+  background-color: #fff;
+}
 
-  .letText {
-    width: 100%;
-    display: flex;
-    justify-content: flex-end;
-  }
+.bottom-container {
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  background-color: #f1f1f1;
+  padding: 18px 0;
+}
 
-  ::v-deep .u-radio-label--undefined {
-    justify-content: flex-end;
-  }
-</style>
+.letText {
+  width: 100%;
+  display: flex;
+  justify-content: flex-end;
+}
+
+::v-deep .u-radio-label--undefined {
+  justify-content: flex-end;
+}
+</style>

src/pages/mine/myBuy/return.vue

@@ -28,14 +28,14 @@
       <view class="title">退货信息填写</view>
       <view class="radio">
         <view class="label"><text style="color: red">*</text>选择类型</view>
-        <u-radio-group :disabled="showDisable" v-model="formdata.applyType" placement="row">
+        <u-radio-group  v-model="formdata.applyType" placement="row">
           <u-radio label="仅退款" activeColor="#01C30B" name="REFUND"></u-radio>
         </u-radio-group>
       </view>
       <view class="content">
         <view class="label"><text style="color: red">*</text>退货原因</view>
         <u--textarea
-          style="backgroundcolor: #fff"
+          style="backgroundColor: #fff"
           :disabled="showDisable"
           v-model="formdata.applyNote"
           placeholder="请输入内容"
@@ -131,7 +131,13 @@ export default {
   },
   methods: {
     back() {
-      uni.navigateBack()
+      // uni.navigateBack()
+       this.$navToPage(
+              {
+                url: ''
+              },
+              'navigateBack'
+            )
     },
     getFiles(value) {
       this.fileurl = []