Merge branch 'master' into develop

src/views/user/member-network-move.vue

@@ -178,7 +178,7 @@
 
 		<!-- 移网审核	-->
     <el-dialog :title="$t('member.reviewNetworkTransfer')" :visible.sync="dialogAuditFormVisible" :width="screenWidth" style="margin-top: -80px">
-      <el-form :model="form" label-width="230px" :label-position="labelPosition" v-loading="dialogAuditLoading" size="mini" style="padding: 10px 15px;">>
+      <el-form :model="form" label-width="230px" :label-position="labelPosition" v-loading="dialogAuditLoading" size="mini" style="padding: 10px 15px;">
         <el-form-item :label="$t('member.networkTransferType')">
           <el-select v-model="form.type" :placeholder="$t('member.selectNetworkTransferType')" style="width: 100%;">
             <el-option v-for="(item,key) in netType" :label="item.name" :value="item.id" :key="key"></el-option>
@@ -349,14 +349,10 @@
         this.auditId = row.ID
         this.dialogEditFormVisible = true
 				fetchNetworkMoveGet({ id: this.auditId }).then(response => {
-					this.$message({
-						message: response,
-						type: 'success'
-					})
 					this.dialogEditLoading = false
-					this.form = response
-					this.form.type = String(response.type)
-					this.form.location = String(response.location)
+					this.form = response.data
+					this.form.type = String(response.data.type)
+					this.form.location = String(response.data.location)
 					this.form.createRemark = this.form.remark
 				}).catch(error => {
 					this.$message({
@@ -392,14 +388,10 @@
         this.auditId = row.ID
         this.dialogAuditFormVisible = true
 				fetchNetworkMoveGet({ id: this.auditId }).then(response => {
-					this.$message({
-						message: response,
-						type: 'success'
-					})
 					this.dialogAuditLoading = false
-					this.form = response
-					this.form.type = String(response.type)
-					this.form.location = String(response.location) !== '0' ? String(response.location) : '1'
+					this.form = response.data
+					this.form.type = String(response.data.type)
+					this.form.location = String(response.data.location) !== '0' ? String(response.data.location) : '1'
 					this.form.createRemark = this.form.remark
 				}).catch(error => {
 					this.$message({