Merge remote-tracking branch 'origin/base-modify' into base-modify

c513b165 · hanfeng · 84673e99 · d53be6a0 · c513b165 · c513b165
Commit c513b165 authored Sep 11, 2019 by hanfeng
4 changed files
--- a/src/views/order/rentVehicleInfo/index.vue
+++ b/src/views/order/rentVehicleInfo/index.vue
--- a/src/views/userManagement/imCustomerServiceManger/model/customerServiceModel.vue
+++ b/src/views/userManagement/imCustomerServiceManger/model/customerServiceModel.vue
@@ -13,7 +13,7 @@
      <el-row>
        <el-col :span="8">
          <el-form-item label="客服电话" prop="telphone">
-            <el-input v-model="form.telphone" placeholder="请输入客服电话" type="number"></el-input>
+            <el-input v-model="form.telphone" placeholder="请输入客服电话" type="number"  :readonly="title==='编辑'"></el-input>
          </el-form-item>
        </el-col>
      </el-row>

--- a/static/utf8-jsp/dialogs/image/image.js
+++ b/static/utf8-jsp/dialogs/image/image.js
--- a/static/utf8-jsp/dialogs/video/video.js
+++ b/static/utf8-jsp/dialogs/video/video.js