Merge branch 'linwenxin_dev' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin into develop

src/views/secondHandMall/commodityManagement/form.vue

@@ -11,7 +11,7 @@
       </zj-form-container>
     </zj-page-fill>
     <div style="box-sizing: border-box; padding: 10px; text-align: right;">
-      <el-button type="primary" size="small" @click="handleSubmit">保存</el-button>
+      <el-button v-if="!disabled" type="primary" size="small" @click="handleSubmit">保存</el-button>
       <el-button v-if="formData.id && ~['SALE'].indexOf(formData.status)" type="primary" size="small"
         @click="copyGoods">克隆商品</el-button>
       <el-button v-if="formData.id && ~['ON'].indexOf(formData.status)" type="primary" size="small"

src/views/secondHandMall/orderManagement/add.vue

@@ -85,6 +85,14 @@ export default {
         "wechatUserMobile": "",
         "wechatUserName": "",
         "wechatUserUrl": "",
+        // 省
+        provinceId: "",
+        // 市
+        cityId: "",
+        // 区
+        areaId: "",
+        // 街道
+        streetId: "",
       },
       classifyList: [],
       esGoodsList: []

src/views/secondHandMall/orderManagement/getLbsAmapRegion.js

@@ -151,10 +151,7 @@ export default {
                         this.formData.streetId = id
                         this.formData.street = name
                         // 赋值GPS详细地址
-                        this.formData.gpsAddress = data.name
-                        if (!this.formData.address) {
-                          this.formData.address = data.name
-                        }
+                        this.formData.receAddress = data.name
                       })
                     })
                   })
@@ -166,7 +163,7 @@ export default {
         {
           name: 'el-input',
           md: 24,
-          formItemAttributes: { label: '', prop: 'address', rules:[{ required: true, message: '请选择', trigger: 'blur' }], },
+          formItemAttributes: { label: '', prop: 'receAddress', rules:[{ required: true, message: '请选择', trigger: 'blur' }], },
           attributes: { disabled: false, placeholder: '详细地址' }
         },
       ]