修改部分页面ui以及bug

manager/src/config/index.js

@@ -17,14 +17,14 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    // common: "https://common-api.pickmall.cn",
-    // buyer: "https://buyer-api.pickmall.cn",
-    // seller: "https://store-api.pickmall.cn",
-    // manager: "https://admin-api.pickmall.cn"
-    common: 'http://192.168.0.109:8890',
-    buyer: 'http://192.168.0.109:8888',
-    seller: 'http://192.168.0.109:8889',
-    manager: 'http://192.168.0.109:8887'
+    common: "https://common-api.pickmall.cn",
+    buyer: "https://buyer-api.pickmall.cn",
+    seller: "https://store-api.pickmall.cn",
+    manager: "https://admin-api.pickmall.cn"
+    // common: 'http://192.168.0.109:8890',
+    // buyer: 'http://192.168.0.109:8888',
+    // seller: 'http://192.168.0.109:8889',
+    // manager: 'http://192.168.0.109:8887'
   },
   api_prod: {
     common: "https://common-api.pickmall.cn",

manager/src/views/distribution/distributionGoods.vue

@@ -67,10 +67,12 @@ export default {
         {
           type: "selection",
           width: 60,
-          align: "center"
+          align: "center",
+          fixed: "left",
         },
         {
           title: "商品图片",
+          fixed: "left",
           key: "thumbnail",
           width: 120,
           align: "center",

manager/src/views/main-components/footer.vue

@@ -8,7 +8,7 @@
     <Row type="flex" justify="center" class="copyright">
       Copyright © 2020 - Present
       <a
-        href="http://lili.cn"
+        href="https://pickmall.cn/"
         target="_blank"
         style="margin:0 5px;"
       >lili-shop</a> {{ $t('rights') }}

manager/src/views/page/article-manage/articleList.vue

@@ -57,7 +57,7 @@
                 <Input type="number" v-model="form.sort" clearable style="width: 10%" />
               </FormItem>
               <FormItem class="form-item-view-el" label="文章内容" prop="content">
-                <editor openXss v-model="form.content"></editor>
+                <editor  openXss v-model="form.content"></editor>
               </FormItem>
               <FormItem label="是否展示" prop="openStatus">
                 <i-switch size="large" v-model="form.openStatus" :true-value="open" :false-value="close">
@@ -435,28 +435,13 @@ export default {
           this.form.categoryId = res.result.categoryId;
           this.treeValue = data.articleCategoryName;
           this.form.id = data.id;
-          this.form.content = htmlEscape(res.result.content);
+          this.form.content =res.result.content;
           this.form.title = res.result.title;
           this.form.sort = res.result.sort;
           this.form.openStatus = res.result.openStatus;
         }
       });
     },
-
-    htmlEscape(text) {
-      return text.replace(/[<>"&]/g, function (match, pos, originalText) {
-        switch (match) {
-          case "<":
-            return "&lt;";
-          case ">":
-            return "&gt;";
-          case "&":
-            return "&amp;";
-          case '"':
-            return "&quot;";
-        }
-      });
-    },
     remove(v) {
       this.$Modal.confirm({
         title: "确认删除",

manager/src/views/promotion/coupon/coupon.vue

@@ -161,7 +161,7 @@ export default {
         },
         {
           title: "活动时间",
-
+          width: 150,
           render: (h, params) => {
             if (params.row.getType === "ACTIVITY") {
               return h("div", "长期有效");

manager/src/views/promotion/pointsGoods/pointsGoods.vue

@@ -2,78 +2,37 @@
   <div class="search">
     <Card>
       <Row>
-        <Form
-          ref="searchForm"
-          :model="searchForm"
-          inline
-          :label-width="70"
-          class="search-form"
-        >
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
           <Form-item label="商品名称">
-            <Input
-              type="text"
-              v-model="searchForm.goodsName"
-              placeholder="请输入商品名称"
-              clearable
-              style="width: 200px"
-            />
+            <Input type="text" v-model="searchForm.goodsName" placeholder="请输入商品名称" clearable style="width: 200px" />
           </Form-item>
           <Form-item label="积分区间">
-            <Input
-              type="text"
-              v-model="searchForm.pointsS"
-              placeholder="请输入开始区间"
-              clearable
-              style="width: 200px"
-            />
+            <Input type="text" v-model="searchForm.pointsS" placeholder="请输入开始区间" clearable style="width: 200px" />
             -
-            <Input
-              type="text"
-              v-model="searchForm.pointsE"
-              placeholder="请输入结束区间"
-              clearable
-              style="width: 200px"
-            />
+            <Input type="text" v-model="searchForm.pointsE" placeholder="请输入结束区间" clearable style="width: 200px" />
           </Form-item>
           <Form-item label="状态">
             <Select v-model="searchForm.promotionStatus" style="width: 200px">
-              <Option
-                v-for="item in statusList"
-                :value="item.value"
-                :key="item.value"
-                >{{ item.label }}</Option
-              >
+              <Option v-for="item in statusList" :value="item.value" :key="item.value">{{ item.label }}</Option>
             </Select>
           </Form-item>
           <Form-item label="SKU编码">
-            <Input
-              type="text"
-              v-model="searchForm.skuId"
-              placeholder="请输入SKU编码"
-              clearable
-              style="width: 200px"
-            />
+            <Input type="text" v-model="searchForm.skuId" placeholder="请输入SKU编码" clearable style="width: 200px" />
           </Form-item>
           <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
         </Form>
       </Row>
       <Row class="operation padding-row">
-        <Button @click="addPointsGoods" type="primary" >添加积分商品</Button>
+        <Button @click="addPointsGoods" type="primary">添加积分商品</Button>
 
       </Row>
-      <Table
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-      >
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table">
         <template slot-scope="{ row }" slot="goodsName">
           <div>
             <a class="mr_10" @click="linkTo(row.goodsSku.goodsId,row.goodsSku.skuId)">{{row.goodsSku.goodsName}}</a>
             <Poptip trigger="hover" title="扫码在手机中查看" transfer>
               <div slot="content">
-                <vue-qr :text="wapLinkTo(row.goodsSku.goodsId,row.goodsSku.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+                <vue-qr :text="wapLinkTo(row.goodsSku.goodsId,row.goodsSku.skuId)" :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
               </div>
               <img src="../../../assets/qrcode.svg" style="vertical-align:middle;" class="hover-pointer" width="20" height="20" alt="">
             </Poptip>
@@ -94,48 +53,15 @@
         </template>
 
         <template slot-scope="{ row }" slot="action">
-          <Button
-            v-if="row.promotionStatus == 'NEW'"
-            type="info"
-            size="small"
-            @click="edit(row.id)"
-            style="margin-right: 5px"
-            >编辑</Button
-          >
-          <Button
-            v-if="row.promotionStatus == 'START'"
-            type="warning"
-            size="small"
-            @click="statusChanged(row.id, 'CLOSE')"
-            style="margin-right: 5px"
-            >停用</Button
-          >
-          <Button
-            v-if="row.promotionStatus == 'CLOSE'"
-            type="warning"
-            size="small"
-            @click="statusChanged(row.id, 'START')"
-            style="margin-right: 5px"
-            >启用</Button
-          >
-          <Button type="error" size="small" @click="close(row.id)"
-            >删除</Button
-          >
+          <Button v-if="row.promotionStatus == 'NEW'" type="info" size="small" @click="edit(row.id)" style="margin-right: 5px">编辑</Button>
+          <Button v-if="row.promotionStatus == 'START'" type="warning" size="small" @click="statusChanged(row.id, 'CLOSE')" style="margin-right: 5px">停用</Button>
+          <Button v-if="row.promotionStatus == 'CLOSE'" type="warning" size="small" @click="statusChanged(row.id, 'START')" style="margin-right: 5px">启用</Button>
+          <Button type="error" size="small" @click="close(row.id)">删除</Button>
         </template>
       </Table>
       <Row type="flex" justify="end" class="page">
-        <Page
-          :current="searchForm.pageNumber"
-          :total="total"
-          :page-size="searchForm.pageSize"
-          @on-change="changePage"
-          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
-          size="small"
-          show-total
-          show-elevator
-          show-sizer
-        ></Page>
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
+          show-total show-elevator show-sizer></Page>
       </Row>
     </Card>
   </div>
@@ -159,55 +85,62 @@ export default {
         pageSize: 10, // 页面大小
         order: "desc", // 默认排序方式
       },
-      statusList: [ // 活动状态
+      statusList: [
+        // 活动状态
         { label: "未开始", value: "NEW" },
         { label: "已开始", value: "START" },
         { label: "已结束", value: "END" },
         { label: "已关闭", value: "CLOSE" },
       ],
-      columns: [ // 表头
+      columns: [
+        // 表头
         {
           title: "商品名称",
           slot: "goodsName",
-          minWidth: 120,
+          minWidth: 150,
+          fixed: "left",
           tooltip: true,
         },
         {
           title: "市场价",
           slot: "price",
+          width: 100,
         },
         {
           title: "结算价",
           slot: "settlementPrice",
+          width: 100,
         },
-        {
-          title: "分类",
-          key: "pointsGoodsCategoryName",
-        },
+
         {
           title: "库存数量",
           slot: "quantity",
+          width: 100,
         },
         {
           title: "活动剩余库存",
           key: "activeStock",
+          width: 150,
         },
         {
           title: "兑换积分",
           key: "points",
+          width: 100,
         },
         {
           title: "所属店铺",
           key: "storeName",
+          width: 100,
         },
         {
           title: "活动开始时间",
           slot: "startTime",
-          minWidth:100
+          minWidth: 150,
         },
         {
           title: "状态",
           key: "promotionStatus",
+          width: 100,
           render: (h, params) => {
             let text = "未知",
               color = "";
@@ -227,10 +160,16 @@ export default {
             return h("div", [h("Tag", { props: { color: color } }, text)]);
           },
         },
+        {
+          title: "分类",
+          key: "pointsGoodsCategoryName",
+          width: 100,
+        },
         {
           title: "操作",
           slot: "action",
           align: "center",
+          fixed: "right",
           width: 150,
         },
       ],
@@ -327,5 +266,5 @@ export default {
 };
 </script>
 <style lang="scss">
-  @import "@/styles/table-common.scss";
+@import "@/styles/table-common.scss";
 </style>