合并master上面的冲突

manager/src/libs/axios.js

@@ -64,14 +64,6 @@ service.interceptors.response.use(
         }
         return data;
         break;
-      case 403:
-        // 权限不足
-        if (data.message !== null) {
-          Message.error(data.message);
-        } else {
-          Message.error("权限不足");
-        }
-        break;
       case 500:
         // 系统异常
         if (data.message !== null) {
@@ -89,6 +81,8 @@ service.interceptors.response.use(
     if (error.response) {
       if (error.response.status === 401) {
         // 这种情况一般调到登录页
+      } else if (error.response.status === 404) {
+        // 避免刷新token报错
       } else if (error.response.status === 403) {
         isRefreshToken++;
         if(isRefreshToken === 1) {

manager/src/views/my-components/lili/upload-pic-thumb.vue

@@ -1,47 +1,48 @@
 <template>
   <div>
-    <vuedraggable
-      :list="uploadList"
-      :disabled="!draggable||!multiple"
-      :animation="200"
-      class="list-group"
-      ghost-class="thumb-ghost"
-      @end="onEnd"
-    >
-      <div class="upload-list" v-for="(item, index) in uploadList" :key="index">
-        <div v-if="item.status == 'finished'" style="height:60px;">
-          <img :src="item.url" />
-          <div class="upload-list-cover">
-            <Icon type="ios-eye-outline" @click="handleView(item.url)"></Icon>
-            <Icon type="ios-trash-outline" @click="handleRemove(item)"></Icon>
+    <div class="upload-pic-thumb">
+      <vuedraggable
+        :list="uploadList"
+        :disabled="!draggable||!multiple"
+        :animation="200"
+        class="list-group"
+        ghost-class="thumb-ghost"
+        @end="onEnd"
+      >
+        <div class="upload-list" v-for="(item, index) in uploadList" :key="index">
+          <div v-if="item.status == 'finished'" style="height:60px;">
+            <img :src="item.url" />
+            <div class="upload-list-cover">
+              <Icon type="ios-eye-outline" @click="handleView(item.url)"></Icon>
+              <Icon type="ios-trash-outline" @click="handleRemove(item)"></Icon>
+            </div>
+          </div>
+          <div v-else>
+            <Progress v-if="item.showProgress" :percent="item.percentage" hide-info></Progress>
           </div>
         </div>
-        <div v-else>
-          <Progress v-if="item.showProgress" :percent="item.percentage" hide-info></Progress>
+      </vuedraggable>
+      <Upload
+        ref="upload"
+        :multiple="multiple"
+        :show-upload-list="false"
+        :on-success="handleSuccess"
+        :on-error="handleError"
+        :format="['jpg','jpeg','png','gif']"
+        :max-size="maxSize*1024"
+        :on-format-error="handleFormatError"
+        :on-exceeded-size="handleMaxSize"
+        :before-upload="handleBeforeUpload"
+        type="drag"
+        :action="uploadFileUrl"
+        :headers="accessToken"
+        style="display: inline-block;width:58px;"
+      >
+        <div style="width: 58px;height:58px;line-height: 58px;">
+          <Icon type="md-camera" size="20"></Icon>
         </div>
-      </div>
-    </vuedraggable>
-    <Upload
-      ref="upload"
-      :multiple="multiple"
-      :show-upload-list="false"
-      :on-success="handleSuccess"
-      :on-error="handleError"
-      :format="['jpg','jpeg','png','gif']"
-      :max-size="maxSize*1024"
-      :on-format-error="handleFormatError"
-      :on-exceeded-size="handleMaxSize"
-      :before-upload="handleBeforeUpload"
-      type="drag"
-      :action="uploadFileUrl"
-      :headers="accessToken"
-      style="display: inline-block;width:58px;"
-    >
-      <div style="width: 58px;height:58px;line-height: 58px;">
-        <Icon type="md-camera" size="20"></Icon>
-      </div>
-    </Upload>
-
+      </Upload>
+    </div>
     <Modal title="图片预览" v-model="viewImage" :styles="{top: '30px'}" draggable>
       <img :src="imgUrl" alt="无效的图片链接" style="width: 100%;margin: 0 auto;display: block;" />
       <div slot="footer">
@@ -242,6 +243,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.upload-pic-thumb{
+  display: flex;
+}
 .upload-list {
   display: inline-block;
   width: 60px;
@@ -255,6 +259,7 @@ export default {
   position: relative;
   box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   margin-right: 5px;
+  vertical-align: middle;
 }
 .upload-list img {
   width: 100%;

manager/src/views/order/order/orderList.vue

@@ -40,7 +40,7 @@
       </Row>
       <div>
         <download-excel class="export-excel-wrapper" :data="data" :fields="fields" name="商品订单.xls">
-          <Button type="primary" class="export">
+          <Button type="info" class="export">
             导出Excel
           </Button>
         </download-excel>
@@ -72,10 +72,6 @@ export default {
         订单编号: "sn",
         下单时间: "createTime",
         客户名称: "memberName",
-        客户账号: "",
-        收货人: "",
-        收货人手机号: "",
-        收货人地址: "",
         支付方式: {
           field: "clientType",
           callback: (value) => {
@@ -92,15 +88,7 @@ export default {
             }
           },
         },
-        配送方式: "",
-        配送费用: "",
-        订单商品金额: "",
-        订单优惠金额: "",
-        订单应付金额: "",
-        商品SKU编号: "",
         商品数量: "groupNum",
-        买家备注: "",
-        订单状态: "",
         付款状态: {
           field: "payStatus",
           callback: (value) => {
@@ -111,9 +99,6 @@ export default {
               : "";
           },
         },
-        发货状态: "",
-        发票类型: "",
-        发票抬头: "",
         店铺: "storeName",
       },
       loading: true, // 表单加载状态
@@ -222,56 +207,23 @@ export default {
           title: "下单时间",
           key: "createTime",
           width: 170,
-          sortable: true,
-          sortType: "desc",
         },
-
         {
           title: "操作",
           key: "action",
           align: "center",
           width: 150,
           render: (h, params) => {
-            return h("div", [
-              h(
-                "Button",
-
-                {
-                  props: {
-                    type: "primary",
-                    size: "small",
-                  },
-                  attrs: {
-                    disabled: params.row.orderStatus == "UNPAID" ? false : true,
-                  },
-                  style: {
-                    marginRight: "5px",
-                  },
-                  on: {
-                    click: () => {
-                      this.confirmPrice(params.row);
-                    },
-                  },
-                },
-                "收款"
+            return h("div", [h("Button", {props: {type: "primary", size: "small",},
+                attrs: {disabled: params.row.orderStatus == "UNPAID" ? false : true,},
+                style: {marginRight: "5px",},
+                on: {click: () => {this.confirmPrice(params.row);},},
+                }, "收款"
               ),
-              h(
-                "Button",
-                {
-                  props: {
-                    type: "info",
-                    size: "small",
-                  },
-                  style: {
-                    marginRight: "5px",
-                  },
-                  on: {
-                    click: () => {
-                      this.detail(params.row);
-                    },
-                  },
-                },
-                "查看"
+              h("Button", {props: {type: "info", size: "small",},
+                  style: {marginRight: "5px",},
+                  on: {click: () => {this.detail(params.row);},},
+                }, "查看"
               ),
             ]);
           },

manager/src/views/promotion/live/live.vue

@@ -119,14 +119,13 @@ export default {
         {
           title: "直播状态",
           render: (h, params) => {
-            return h(
-              "span",
-              params.row.status == "NEW"
-                ? "未开始"
-                : params.row.status == "START"
-                ? "直播中"
-                : "已结束"
-            );
+            if(params.row.status == "NEW"){
+              return h("div", [h("tag", {props: {color: "blue"}}, "未开始")]);
+            }else if(params.row.status == "START"){
+              return h("div", [h("tag", {props: {color: "green"}}, "直播中")]);
+            }else{
+              return h("div", [h("tag", {props: {color: "volcano"}}, "已结束")]);
+            }
           },
         },
         {

manager/src/views/promotion/seckill/seckill.vue

@@ -102,13 +102,13 @@ export default {
           width: 100,
           render: (h, params) => {
             if (params.row.promotionStatus == "NEW") {
-              return h("Tag", {props: {color: "volcano",},},"新建");
+              return h("Tag", {props: {color: "geekblue",},},"新建");
             } else if (params.row.promotionStatus == "START") {
-              return h("Tag", {props: {color: "blue",},},"开始");
+              return h("Tag", {props: {color: "green",},},"开始");
             } else if (params.row.promotionStatus == "END") {
-              return h("Tag", {props: {color: "green",},},"结束");
-            } else if (params.row.promotionStatus == "CLOSE") {
               return h("Tag", {props: {color: "volcano",},},"结束");
+            } else if (params.row.promotionStatus == "CLOSE") {
+              return h("Tag", {props: {color: "red",},},"结束");
             }
           },
         },

manager/src/views/seller/shop/shopOperation.vue

@@ -65,13 +65,13 @@
               <FormItem label="详细地址" prop="salesConsigneeDetail">
                 <Input v-model="shopForm.salesConsigneeDetail" clearable style="width: 350px" />
               </FormItem>
-              <!-- <Divider orientation="left">腾讯云智服</Divider>
+              <Divider orientation="left">腾讯云智服</Divider>
               <FormItem label="唯一标识" prop="salesConsigneeDetail">
                 <Input v-model="shopForm.yzfSign" clearable style="width: 350px" />
               </FormItem>
               <FormItem label="小程序唯一标识" prop="salesConsigneeDetail">
                 <Input v-model="shopForm.yzfMpSign" clearable style="width: 350px" />
-              </FormItem> -->
+              </FormItem>
               <Spin fix v-if="loading"></Spin>
             </div>
           </TabPane>