diff --git a/src/views/order/index_credit.vue b/src/views/order/index_credit.vue
index b09f67d..0f2bbe1 100644
--- a/src/views/order/index_credit.vue
+++ b/src/views/order/index_credit.vue
@@ -169,7 +169,7 @@
                   />
                 </el-input>
               </el-form-item>
-              <el-form-item label="活动类型：" class="width100">
+              <!-- <el-form-item label="活动类型：" class="width100">
                 <el-select
                   v-model="tableFrom.activity_type"
                   placeholder="请选择"
@@ -184,39 +184,39 @@
                     :value="item.value"
                   />
                 </el-select>
+              </el-form-item> -->
+              <el-form-item
+                label="关键字："
+                class="width100"
+              >
+                <el-input
+                  v-model="tableFrom.keywords"
+                  placeholder="请输入订单号/收货人/联系方式"
+                  class="selWidth"
+                  size="small"
+                  @keyup.enter.native="getList(1), getCardList()"
+                >
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    size="small"
+                    class="el-button-solt"
+                    @click="getList(1), getCardList()"
+                  />
+                </el-input>
+                <el-dropdown class="dropdown" @command="exports">
+                  <span class="el-dropdown-link">
+                    列表导出<i class="el-icon-arrow-down el-icon--right" />
+                  </span>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item command="1">导出订单</el-dropdown-item>
+                    <el-dropdown-item command="2">导出发货单</el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+                <!-- <el-button size="small" type="primary" @click="getExportFileList">导出记录</el-button> -->
               </el-form-item>
             </div>
-            <el-form-item
-              label="关键字："
-              class="width100"
-              style="display: block"
-            >
-              <el-input
-                v-model="tableFrom.keywords"
-                placeholder="请输入订单号/收货人/联系方式"
-                class="selWidth"
-                size="small"
-                @keyup.enter.native="getList(1), getCardList()"
-              >
-                <el-button
-                  slot="append"
-                  icon="el-icon-search"
-                  size="small"
-                  class="el-button-solt"
-                  @click="getList(1), getCardList()"
-                />
-              </el-input>
-              <el-dropdown class="dropdown" @command="exports">
-                <span class="el-dropdown-link">
-                  列表导出<i class="el-icon-arrow-down el-icon--right" />
-                </span>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="1">导出订单</el-dropdown-item>
-                  <el-dropdown-item command="2">导出发货单</el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
-              <!-- <el-button size="small" type="primary" @click="getExportFileList">导出记录</el-button> -->
-            </el-form-item>
+
             <el-form-item label="用户信息：" class="width100">
               <el-input
                 v-model="tableFrom.username"
@@ -355,7 +355,7 @@
             >
           </template>
         </el-table-column>
-        <el-table-column label="订单类型" min-width="100">
+        <!-- <el-table-column label="订单类型" min-width="100">
           <template slot-scope="scope">
             <span>{{
               scope.row.is_virtual == 1
@@ -392,8 +392,8 @@
           prop="real_name"
           label="收货人/订购人"
           min-width="130"
-        />
-        <el-table-column label="商品信息" min-width="330">
+        /> -->
+        <el-table-column label="商品信息" min-width="280">
           <template slot-scope="scope">
             <div
               v-for="(val, i) in scope.row.orderProduct"
@@ -410,7 +410,7 @@
                 >{{ val.cart_info.product.store_name + " | "
                 }}{{ val.cart_info.productAttr.sku }}</span
               >
-              <span class="tabBox_pice">
+              <!-- <span class="tabBox_pice">
                 <span
                   v-if="
                     scope.row.activity_type === 2 &&
@@ -446,18 +446,72 @@
                   style="color: red; font-style: normal"
                   >(-{{ val.product_num - val.refund_num }})</em
                 >
-              </span>
+              </span> -->
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="实际支付" min-width="100">
+        <!-- <el-table-column label="实际支付" min-width="100">
           <template slot-scope="scope">
             <span>{{ scope.row.pay_price }}</span>
             <p v-if="scope.row.finalOrder">
               尾款：{{ scope.row.finalOrder.pay_price }}
             </p>
           </template>
+        </el-table-column> -->
+        <el-table-column prop="pay_price" label="订单金额" min-width="100" />
+        <el-table-column label="收款公司" min-width="320">
+          <template slot-scope="scope">
+            <div v-if="scope.row.order_extend"
+            >
+              <div v-if="scope.row.order_extend.bank_info">
+                <div>公司名称: {{scope.row.order_extend.bank_info.company_name||'-'}}</div>
+                <div>对公账户: {{scope.row.order_extend.bank_info.corporate_account||'-'}}</div>
+                <div>开户行: {{scope.row.order_extend.bank_info.corporate_bank||'-'}}</div>
+                <div>开户行地址: {{scope.row.order_extend.bank_info.corporate_bank_address||'-'}}</div>
+              </div>
+              <div v-else>-</div>
+            </div>
+            <div v-else>-</div>
+          </template>
         </el-table-column>
+        <el-table-column label="收款凭证" min-width="80" >
+          <template slot-scope="scope">
+            <div v-if="scope.row.order_extend"
+              class="tabBox acea-row row-middle"
+            >
+              <div class="demo-image__preview" v-if="scope.row.order_extend.image">
+                <el-image
+                  :src="scope.row.order_extend.image"
+                  :preview-src-list="[scope.row.order_extend.image]"
+                />
+              </div>
+              <div v-else>-</div>
+            </div>
+            <div v-else>-</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="pay_price" label="手续扣除" min-width="100" >
+          <template slot-scope="scope">
+            <div v-if="scope.row.order_extend&&scope.row.order_extend.commission_rate"
+            >
+              {{ scope.row.order_extend.commission_rate }}
+            </div>
+            <div v-else>-</div>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column prop="pay_price" label="押金扣除" min-width="100" /> -->
+        <el-table-column label="剩余金额" min-width="100">
+          <template slot-scope="scope">
+            <div v-if="scope.row.order_extend&&scope.row.order_extend.commission_rate"
+            >
+              {{ (scope.row.pay_price - scope.row.order_extend.commission_rate).toFixed(2) }}
+            </div>
+            <div v-else>{{scope.row.pay_price}}</div>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column prop="pay_price" label="返点扣除" min-width="100" /> -->
+        <!-- <el-table-column prop="pay_price" label="应支付金额" min-width="100" /> -->
+        <!-- <el-table-column prop="pay_price" label="收款信息" min-width="180" /> -->
         <!-- <el-table-column label="订单佣金" min-width="100">
           <template slot-scope="scope">
             <span>{{
@@ -483,14 +537,14 @@
             >
           </template>
         </el-table-column> -->
-        <el-table-column label="支付类型" min-width="80">
+        <!-- <el-table-column label="支付类型" min-width="80">
           <template slot-scope="scope">
             <span v-if="scope.row.paid === 1">{{
               scope.row.pay_type | orderPayType
             }}</span>
             <span v-else>--</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="支付状态" min-width="80">
           <template slot-scope="scope">
             <!-- <span>{{ scope.row.paid === 0 ? "未支付" : "已支付" }}</span> -->
@@ -517,7 +571,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="create_time" label="下单时间" min-width="130" />
-        <el-table-column label="推广人" min-width="100">
+        <!-- <el-table-column label="推广人" min-width="100">
           <template slot-scope="scope">
             <span>{{
               (scope.row.spread && scope.row.spread.nickname) || "无"
@@ -530,7 +584,7 @@
               (scope.row.TopSpread && scope.row.TopSpread.nickname) || "无"
             }}</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
           key="8"
           label="操作"
diff --git a/src/views/systemForm/setSystem/modifyStoreInfo.vue b/src/views/systemForm/setSystem/modifyStoreInfo.vue
index 840d626..1018663 100644
--- a/src/views/systemForm/setSystem/modifyStoreInfo.vue
+++ b/src/views/systemForm/setSystem/modifyStoreInfo.vue
@@ -132,8 +132,8 @@
                 <div v-else class="upLoad">
                   <i class="el-icon-camera cameraIconfont" />
                 </div>
-                <div class="trip">建议尺寸：710*134px或710*460px(请根据平台要求选择尺寸，此图如未上传默认展示店铺背景图)</div>    
-              </div> 
+                <div class="trip">建议尺寸：710*134px或710*460px(请根据平台要求选择尺寸，此图如未上传默认展示店铺背景图)</div>
+              </div>
             </el-form-item>
             <el-form-item class="form-item" label="店铺资质：" :prop="merData.sys_bases_status == 1 ? 'uploadedqualifications' : ''">
               <div class="upLoadPicBox_qualification">
@@ -141,14 +141,14 @@
                   <div class="uploadpicBox_list_image">
                     <el-image ref="elImage" :src="item.url" :preview-src-list="[item.url]" />
                   </div>
-                  <div class="uploadpicBox_list_method">
+                  <!-- <div class="uploadpicBox_list_method">
                     <i class="el-icon-delete" @click="deldetQualificationsList(index)" />
                     <i class="el-icon-view" @click="viewImage(item, index)" />
-                  </div>
+                  </div> -->
                 </div>
-                <el-upload :action="fileUrl" :show-file-list="false" list-type="picture-card" multiple :headers="myHeaders" :on-success="setQualificationsList" :before-upload="beforeUploadQualification">
+                <!-- <el-upload :action="fileUrl" :show-file-list="false" list-type="picture-card" multiple :headers="myHeaders" :on-success="setQualificationsList" :before-upload="beforeUploadQualification">
                   <i class="el-icon-plus" />
-                </el-upload>
+                </el-upload> -->
               </div>
             </el-form-item>
             <el-form-item label="配送方式:" prop="delivery_way">
@@ -205,6 +205,7 @@
                     filterable
                     multiple
                     placeholder="请选择营业时间"
+                    style="width: 300px;"
                   >
                     <el-option
                       v-for="item in date"
@@ -248,7 +249,7 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="商户简介：" prop="mer_info">
+                <el-form-item label="商户简介：">
                   <el-input v-model="merData.mer_info" type="textarea" placeholder="文字简介，200字以内" />
                 </el-form-item>
               </el-col>
@@ -259,7 +260,8 @@
                   </div>
                 </el-form-item>
                 <el-form-item label="客服电话：">
-                  <el-input v-model="merData.service_phone" type="number"/>
+                  <el-input v-model="merData.mer_phone" type="number" disabled/>
+                  <!-- <el-input v-model="merData.service_phone" type="number"/> -->
                 </el-form-item>
               </el-col>
             </el-row>
@@ -415,7 +417,7 @@ export default {
   //       }
   //     },100)
   //   }
-  
+
 // var checkPhone = (rule, value, callback) => {
 //       if (value === '') {
 //         callback(new Error('请输入电话号码'))
@@ -538,7 +540,7 @@ export default {
   },
   created() {
     this.getMapInfo()
-    
+
 
   },
   mounted: function() {
@@ -615,7 +617,7 @@ export default {
           })
         } else {
           that.uploadedQualifications = []
-        }   
+        }
         if(that.merData.is_margin == 1)(this.getCode())
       })
     },
@@ -670,7 +672,7 @@ export default {
                 this.$message.error(rej.data.message)
         })
       }
-      
+
     },
     // 获取支付二维码
     getCode() {
@@ -692,7 +694,7 @@ export default {
     getRecordList(){
       let that = this
       that.loading = true;
-      marginRecordLst(that.tableFrom).then(async (res) => { 
+      marginRecordLst(that.tableFrom).then(async (res) => {
         that.tableData.data = res.data.list;
         that.tableData.total = res.data.count;
         that.loading = false;
@@ -978,7 +980,7 @@ export default {
     border-radius: 8px;
     padding: 10px;
     box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
-    
+
     img{
       width: 160px;
       height: 160px;
@@ -988,7 +990,7 @@ export default {
       font-size: 16px;
       color: #303133;
       font-weight: normal;
-     
+
     }
     .pay_price{
       font-size: 18px;
@@ -1003,7 +1005,7 @@ export default {
     .pay_time{
       font-size: 12px;
       color: #6D7278;
-      
+
     }
   }