diff --git a/buyer/src/pages/home/orderCenter/OrderDetail.vue b/buyer/src/pages/home/orderCenter/OrderDetail.vue
index 4d910b84..cb6c61ec 100644
--- a/buyer/src/pages/home/orderCenter/OrderDetail.vue
+++ b/buyer/src/pages/home/orderCenter/OrderDetail.vue
@@ -619,7 +619,6 @@ table {
 
 
 .div-express-log {
-  max-height: 300px;
   border: solid 1px #e7e7e7;
   background: #fafafa;
   overflow-y: auto;
diff --git a/manager/src/views/member/list/memberDetail.vue b/manager/src/views/member/list/memberDetail.vue
index a03c260d..18aca816 100644
--- a/manager/src/views/member/list/memberDetail.vue
+++ b/manager/src/views/member/list/memberDetail.vue
@@ -192,9 +192,6 @@
           </div>
         </TabPane>
         <TabPane label="TA收货地址" name="address">
-          <Row class="operation padding-row">
-            <Button @click="addMemberAddress" type="primary">新增</Button>
-          </Row>
           <Table
             :loading="loading"
             border
@@ -398,7 +395,6 @@
           ],
           consigneeAddressPath: [{required: true, message: "收货人地址不能为空"}],
           detail: [{required: true, message: "收货人详细地址不能为空"}],
-          alias: [{required: true, message: "收货人地址别名不能为空"}],
         },//会员地址操作表单校验
         //历史积分表格
         pointsColumns: [
@@ -669,58 +665,6 @@
 
             }
           },
-          {
-            title: "操作",
-            key: "action",
-            align: "center",
-            width: 120,
-            fixed: "right",
-            render: (h, params) => {
-              return h("div", {
-                style: {
-                  display: "flex",
-                  justifyContent: "center"
-                }
-              }, [
-                h(
-                  "Button",
-                  {
-                    props: {
-                      type: "error",
-                      size: "small",
-                    },
-                    style: {
-                      marginRight: "5px",
-                    },
-                    on: {
-                      click: () => {
-                        this.memberAddressRemove(params.row);
-                      },
-                    },
-                  },
-                  "删除"
-                ),
-                h(
-                  "Button",
-                  {
-                    props: {
-                      type: "info",
-                      size: "small",
-                    },
-                    style: {
-                      marginRight: "5px",
-                    },
-                    on: {
-                      click: () => {
-                        this.editAddress(params.row);
-                      },
-                    },
-                  },
-                  "编辑"
-                ),
-              ]);
-            },
-          },
 
         ],
         addressData: [],//历史积分数据
@@ -954,25 +898,6 @@
         });
         this.loading = false;
       },
-      //新增TA的收货地址
-      addMemberAddress() {
-        this.addressModalTitle = "新增会员地址";
-        this.addressModalVisible = true
-        this.addressForm = {
-          id: "",
-          isDefault: 0,
-        }
-
-      },
-      //修改TA的收货地址
-      editAddress(v) {
-        this.addressModalTitle = "修改会员地址";
-        this.addressForm = JSON.parse(JSON.stringify(v));
-        this.addressForm.isDefault = v.isDefault?1:0;
-        // this.$set(this, "addressForm", v);
-        delete this.addressForm.updateTime;
-        this.addressModalVisible = true
-      },
       //新增或者修改表单提交
       addressSubmit() {
         this.addressForm.memberId = this.id
diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue
index fbfd09b8..bc8d2388 100644
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@@ -571,8 +571,9 @@
           </div>
         </template>
         <template slot="numSlot" slot-scope="{ row, index }">
-          <InputNumber :min="0" :max="row.___num - row.deliverNumber" v-model="data[index].canNum">
-          </InputNumber>
+          <InputNumber v-model="row.canNum" :disabled="!selectGroupShipGoods.find(item=>item.id === row.id)"
+                       :max="row.___num - row.deliverNumber - row.returnNum" :min="0"
+                       @on-change="changeNum($event,index)"></InputNumber>
         </template>
       </Table>
       <div slot="footer">
@@ -872,6 +873,16 @@ export default {
         }
       });
     },
+    changeNum(number, index) {
+      const current = this.data[index]
+      if (this.selectGroupShipGoods.length) {
+        this.selectGroupShipGoods.forEach(item => {
+          if (item.skuId === current.skuId) {
+            item.canNum = number
+          }
+        })
+      }
+    },
     // 分包裹发货
     confirmShipGroupGoods () {
       this.$refs.groupOrderDeliveryForm.validate(async (valid) => {
@@ -1145,7 +1156,7 @@ export default {
       })
     },
     toPrints () {
-      if (this.form.logisticsId != null && this.form.logisticsId != '') {
+      if (this.faceSheetForm.logisticsId != null && this.faceSheetForm.logisticsId != '') {
         this.orderDeliverModal = false;
       }
     },
diff --git a/seller/src/views/promotion/live/addLive.vue b/seller/src/views/promotion/live/addLive.vue
index 7e5e893f..8673b848 100644
--- a/seller/src/views/promotion/live/addLive.vue
+++ b/seller/src/views/promotion/live/addLive.vue
@@ -64,115 +64,19 @@
 
         <!-- 分享卡片 -->
         <FormItem label="分享卡片封面" prop="feedsImg">
-          <div class="upload-list" v-if="liveForm.feedsImg">
-            <template>
-              <img :src="liveForm.feedsImg" />
-              <div class="upload-list-cover">
-                <Icon
-                  type="ios-eye-outline"
-                  @click.native="handleView(liveForm.feedsImg)"
-                ></Icon>
-                <Icon
-                  type="ios-trash-outline"
-                  @click.native="handleRemove('feedsImg')"
-                ></Icon>
-              </div>
-            </template>
-          </div>
-          <Upload
-            v-if="liveForm.feedsImg.length == 0"
-            ref="upload"
-            :show-upload-list="false"
-            :on-success="handleFeedsImgSuccess"
-            :format="['jpg', 'jpeg', 'png']"
-            :on-format-error="handleFormatError"
-            :max-size="1024"
-            :on-exceeded-size="handleMaxSize"
-            type="drag"
-            :action="action"
-            :headers="accessToken"
-            style="display: inline-block; width: 58px"
-          >
-            <div style="width: 58px; height: 58px; line-height: 58px">
-              <Icon type="ios-camera" size="20"></Icon>
-            </div>
-          </Upload>
+          <upload-pic-thumb v-model="liveForm.feedsImg" :multiple="false"></upload-pic-thumb>
           <div class="tips">直播间分享图，图片规则：建议像素800*640，大小不超过1M；</div>
         </FormItem>
 
         <!-- 直播间背景墙 -->
         <FormItem label="直播间背景墙" prop="coverImg">
-          <div class="upload-list" v-if="liveForm.coverImg">
-            <template>
-              <img :src="liveForm.coverImg" />
-              <div class="upload-list-cover">
-                <Icon
-                  type="ios-eye-outline"
-                  @click.native="handleView(liveForm.coverImg)"
-                ></Icon>
-                <Icon
-                  type="ios-trash-outline"
-                  @click.native="handleRemove('coverImg')"
-                ></Icon>
-              </div>
-            </template>
-          </div>
-          <Upload
-            v-if="liveForm.coverImg.length == 0"
-            ref="upload"
-            :show-upload-list="false"
-            :on-success="handleCoverImgSuccess"
-            :format="['jpg', 'jpeg', 'png']"
-            :on-format-error="handleFormatError"
-            :max-size="1024"
-            :on-exceeded-size="handleMaxSize"
-            type="drag"
-            :action="action"
-            :headers="accessToken"
-            style="display: inline-block; width: 58px"
-          >
-            <div style="width: 58px; height: 58px; line-height: 58px">
-              <Icon type="ios-camera" size="20"></Icon>
-            </div>
-          </Upload>
+          <upload-pic-thumb v-model="liveForm.coverImg" :multiple="false"></upload-pic-thumb>
           <div class="tips">直播间背景图，图片规则：建议像素1080*1920，大小不超过1M</div>
         </FormItem>
 
         <!-- 直播间背景墙 -->
         <FormItem label="直播间分享图" prop="shareImg">
-          <div class="upload-list" v-if="liveForm.shareImg">
-            <template>
-              <img :src="liveForm.shareImg" />
-              <div class="upload-list-cover">
-                <Icon
-                  type="ios-eye-outline"
-                  @click.native="handleView(liveForm.shareImg)"
-                ></Icon>
-                <Icon
-                  type="ios-trash-outline"
-                  @click.native="handleRemove('shareImg')"
-                ></Icon>
-              </div>
-            </template>
-          </div>
-          <Upload
-            v-if="liveForm.shareImg.length == 0"
-            ref="upload"
-            :show-upload-list="false"
-            :on-success="handleShareImgSuccess"
-            :format="['jpg', 'jpeg', 'png']"
-            :on-format-error="handleFormatError"
-            :max-size="1024"
-            :on-exceeded-size="handleMaxSize"
-            type="drag"
-            :action="action"
-            :headers="accessToken"
-            style="display: inline-block; width: 58px"
-          >
-            <div style="width: 58px; height: 58px; line-height: 58px">
-              <Icon type="ios-camera" size="20"></Icon>
-            </div>
-          </Upload>
+          <upload-pic-thumb v-model="liveForm.shareImg" :multiple="false"></upload-pic-thumb>
           <div class="tips">直播间分享图，图片规则：建议像素800*640，大小不超过1M</div>
         </FormItem>
 
@@ -261,6 +165,7 @@
 
 <script>
 import { uploadFile } from "@/libs/axios";
+import uploadPicThumb from "@/views/my-components/lili/upload-pic-thumb";
 import {
   addLive,
   addLiveGoods,
@@ -272,6 +177,7 @@ import liveGoods from "./liveGoods";
 export default {
   components: {
     liveGoods,
+    uploadPicThumb,
   },
   data() {
     return {