Merge branch 'dev' of http://120.25.63.219:6088/rex/portalhtml into dev

src/router/modules/models.js

@@ -33,7 +33,7 @@ const modelsRouter = {
     },
     {
       path: 'all',
-      component: () => import('@/views/models/total-models'),
+      component: () => import('@/views/models/all-models'),
       name: 'AllModels',
       meta: { title: '模板' }
     },

src/views/customers/citypotenial-list/index.vue

@@ -334,7 +334,7 @@ export default {
       const page={
       currentPage:1,
       pageSize:10,
-      objectID:this.id
+      businessObjectID:this.id
      }
       getOneModel(page).then(resp=>{
         this.tableData2=resp.results
@@ -342,6 +342,7 @@ export default {
     },
     getList(){
        getCustomer({objectID:this.id}).then((resp)=>{
+             resp.results[0].ExtChannelType_SDK=null
             this.formData=resp.results[0]
             lockRsp({extProvince_SDK: resp.results[0].ExtProvince_SDK}).then((resp)=>{
             this.province=resp.results  

src/views/customers/potential-list/index.vue

@@ -314,7 +314,7 @@ export default {
       const page={
       currentPage:1,
       pageSize:10,
-      objectID:this.id
+      businessObjectID:this.id
      }
       getOneModel(page).then(resp=>{
         this.tableData2=resp.results

src/views/login/city-register/index.vue

@@ -270,7 +270,7 @@
                          :on-success="handleAvatarSuccess"
                          :on-remove="handleRemoveFile"
                          action="https://jsonplaceholder.typicode.com/posts/"
-                         accept=".doc,.txt,.pdf,.xls,.docx,.xlsx,.jpg,.png"
+                         accept=".doc,.txt,.pdf,.xls,.docx,.xlsx "
                          :limit="1">
                 <el-button size="small"
                            type="primary">点击上传</el-button>
@@ -472,7 +472,7 @@ export default {
           this.$request(Customer.searchUrl, this.paramsToFormData(this.formData)).then((resp) => {
             this.btnloading = false
             this.$message.success('提交成功！')
-            this.handleClickGoBack()
+            this.$router.back()
           }).catch((err) => {
             this.btnloading=false
           // this.$message({

src/views/login/prov-register/index.vue

@@ -329,7 +329,7 @@
         ref="uploadExcel"
         action="https://jsonplaceholder.typicode.com/posts/"
         :limit='1'
-        accept=".doc,.txt,.pdf,.xls,.docx,.xlsx,.jpg,.png"
+        accept=".doc,.txt,.pdf,.xls,.docx,.xlsx "
          :on-success="handleAvatarSuccess"
          :on-remove="handleRemoveFile"
         :on-change="fileChange"