Merge branch 'pre-release' of...

Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into pre-release

src/views/ecw/customer/edit.vue

@@ -739,7 +739,6 @@
         </el-form>
       </el-card>
 
-      <el-form ref="setForm" label-width="150px">
       <el-card class="box-card" style="margin-top: 15px;">
         <div slot="header" class="clearfix">
           <span class="title-text">{{ $t('设置') }}</span>
@@ -751,7 +750,8 @@
             >{{showSettingFlag ? $t('隐藏') : $t('更多')}}</el-button
           >
         </div>
-          <el-row :gutter="10" v-if="showSettingFlag">
+        <el-form ref="setForm" label-width="150px"  v-if="showSettingFlag">
+          <el-row :gutter="10">
             <el-col :span="12">
               <el-form-item :label="$t('是否显示提单价格')" prop="isShowTidanPrice">
                 <el-switch v-model="form.isShowTidanPrice"></el-switch>
@@ -834,6 +834,7 @@
             </el-col>
 
           </el-row>
+        </el-form>
       </el-card>
 
       <el-card class="box-card" style="margin-top: 15px;">
@@ -847,7 +848,8 @@
             >{{showFinanceFlag ? $t('隐藏') : $t('更多')}}</el-button
           >
         </div>
-          <el-row :gutter="10" v-if="showFinanceFlag">
+        <el-form ref="financeForm" label-width="150px" v-if="showFinanceFlag">
+          <el-row :gutter="10">
             <el-col :span="12">
               <el-form-item :label="$t('公司名称')" prop="company">
                 <el-input
@@ -905,8 +907,7 @@
               </el-form-item>
             </el-col>
 
-            <h3>{{$t('开票信息')}}</h3>
-
+            <h3 style="font-size: 15px;">{{$t('开票信息')}}</h3>
             <el-col :span="12">
               <el-form-item :label="$t('发票抬头')" prop="invoiceTitle">
                 <el-input
@@ -974,22 +975,19 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-card>
         </el-form>
 
-      <el-card class="box-card" style="margin-top: 15px;">
-        <div slot="header" class="clearfix">
-          <span class="title-text">{{ $t("银行信息") }}</span>
+        <el-form ref="bankForm" :model="form" v-if="showFinanceFlag">
+          <el-row type="flex" class="row-bg" justify="space-between">
+            <span style="font-size: 15px; line-height: 30px">{{$t('银行信息')}}</span>
             <el-button
-            style="float: right"
               size="small"
               type="primary"
               @click="addBankData"
               >+</el-button
             >
-        </div>
-        <el-form ref="bankForm" :model="form">
-          <el-table border :data="form.customerBanks">
+          </el-row>
+          <el-table border :data="form.customerBanks" style="margin-top: 10px">
             <el-table-column
               :label="$t('序号')"
               type="index"

src/views/ecw/order/components/imageDisplay.vue

@@ -10,7 +10,7 @@
       :visible.sync="visible"
       width="80%">
       <div style="display: flex;flex-wrap: wrap;">
-        <el-image style="width: 200px;height: 200px;margin-right: 10px;margin-bottom: 10px" v-for="(item) in list"  :src="bizId ? item.url : item">
+        <el-image style="width: 200px;height: 200px;margin-right: 10px;margin-bottom: 10px" v-for="(item) in list"  :src="bizId ? item.url : item" :preview-src-list="[bizId ? item.url : item]">
           <video controls width="148px" height="148px" slot="error" :src="bizId ? item.url : item" ></video>
         </el-image>
       </div>