Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui

# Conflicts: # manager/src/views/promotion/coupon/coupon.vue # seller/src/views/promotion/coupon/coupon.vue
2025-12-18 00:45:54 +08:00 · 2021-05-24 15:45:46 +08:00
parent 5d393cbb06 44c88468d4
commit 35af0f2744
69 changed files with 1572 additions and 1477 deletions
--- a/manager/src/api/index.js
+++ b/manager/src/api/index.js
@@ -8,13 +8,14 @@ import {
  getRequestWithNoToken,
  putRequestWithNoForm,
  postRequestWithNoForm,
-  commonUrl,
  managerUrl
 } from "@/libs/axios";
 import config from "@/config";

+let commonUrl = (process.env.NODE_ENV === 'development' ? config.api_dev.common : config.api_prod.common)
+
 // 文件上传接口
-export const uploadFile = commonUrl + "/common/upload/file";
+export const uploadFile = commonUrl+ "/common/upload/file";
 // 验证码渲染图片接口
 export const drawCodeImage = commonUrl + "/common/captcha/draw/";
 // 获取菜单
--- a/manager/src/views/distribution/distributionOrder.vue
+++ b/manager/src/views/distribution/distributionOrder.vue
@@ -202,6 +202,7 @@
          this.loading = false;
          if (res.success) {
            this.data = res.result.records;
+
            this.total = res.result.total;
          }
        });
@@ -239,7 +240,7 @@
    }
  };
 </script>
-<style lang="scss">
+<style lang="scss" >
  @import "@/styles/table-common.scss";
 </style>

--- a/manager/src/views/goods/goods-info/goods.vue
+++ b/manager/src/views/goods/goods-info/goods.vue
@@ -56,16 +56,22 @@
            >

              <!-- 商品栏目格式化 -->
-              <template slot="goodsSlot" slot-scope="scope">
+              <template slot="goodsSlot" slot-scope="{row}">
                <div style="margin: 5px 0px;height: 80px; display: flex;">
                  <div style="">
-                    <img :src="scope.row.original" style="height: 60px;margin-top: 1px;width: 60px">
+                    <img :src="row.original" style="height: 60px;margin-top: 1px;width: 60px">
                  </div>

                  <div style="margin-left: 13px;">
-                    <div class="div-zoom" >
-                      <a>{{scope.row.goodsName}}</a>
+                    <div class="div-zoom">
+                      <a @click="linkTo(row.id,row.skuId)">{{row.goodsName}}</a>
                    </div>
+                    <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+                      <div slot="content">
+                        <vue-qr :text="wapLinkTo(row.id,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+                      </div>
+                      <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
+                    </Poptip>
                  </div>
                </div>

--- a/manager/src/views/goods/goods-manage/category.vue
+++ b/manager/src/views/goods/goods-manage/category.vue
@@ -244,6 +244,7 @@ export default {
    //弹出品牌关联框
    brandOperation(v) {
      getCategoryBrandListData(v.id).then((res) => {
+        console.warn(res)
        this.categoryId = v.id;
        this.modalBrandTitle = "品牌关联";
        this.brandForm.categoryBrands = res.result.map((item) => item.id);
--- a/manager/src/views/goods/goods-manage/parameter.vue
+++ b/manager/src/views/goods/goods-manage/parameter.vue
@@ -31,9 +31,7 @@
          </p>
          <template v-if="group.params && group.params.length > 0">
            <div v-for="param in group.params" :key="param.param_id" class="params">
-              <span>{{ param.paramName }} 【{{
-                  param.paramType | paramTypeFilter
-                }}】</span>
+              <span>{{ param.paramName }}</span>

              <span>
                <i-button type="text" @click="handleEditParams(group, param)">编辑</i-button>
@@ -56,19 +54,30 @@
          <FormItem label="参数名称" prop="paramName">
            <Input v-model="paramForm.paramName" style="width: 100%" />
          </FormItem>
-          <FormItem label="参数类型" prop="paramType">
-            <Select :loading="userLoading" v-model="paramForm.paramType">
-              <Option :value="1" :key="1">输入项</Option>
-              <Option :value="2" :key="2">选择项</Option>
+          <FormItem label="可选值" prop="options">
+            <Select
+              v-model="paramForm.options"
+              placeholder="输入后回车添加"
+              multiple
+              filterable
+              allow-create
+              :popper-append-to-body="false"
+              popper-class="spec-values-popper"
+              style="width: 100%; text-align: left; margin-right: 10px"
+            >
+              <Option
+                v-for="item in ops"
+                :value="item"
+                :key="item"
+                :label="item"
+              >
+                {{item}}
+              </Option>
            </Select>
          </FormItem>
-          <FormItem label="可选值" prop="options">
-            <i-input v-model="paramForm.options" type="textarea" :rows="3" placeholder="请输入可选值,选择项实用逗号分隔"></i-input>
-          </FormItem>
-
          <FormItem label="选项" prop="specName3">
-            <Checkbox :value="Number" v-model="paramForm.required">必填</Checkbox>
-            <Checkbox v-model="paramForm.isIndex">可索引</Checkbox>
+            <Checkbox label=1 v-model="paramForm.required">必填</Checkbox>
+            <Checkbox label=1 v-model="paramForm.isIndex">可索引</Checkbox>
          </FormItem>
        </Form>

@@ -127,6 +136,10 @@ export default {
      paramId: "",
      //参数表单
      paramForm: {},
+      /** 参数值 **/
+      ops:{
+        options: []
+      },
      paramGroupForm: {},
      /** 添加、编辑参数 规格 */
      formValidate: {
@@ -170,14 +183,15 @@ export default {
    handleEditParams(group, param) {
      this.paramForm = {
        paramName: param.paramName,
-        paramType: param.paramType,
-        options: param.options,
-        required: param.required,
-        isIndex: param.isIndex,
+        options:  param.options.split(","),
+        required: param.required==1?true:false,
+        isIndex: param.isIndex==1?true:false,
        groupId: group.groupId,
        categoryId: this.categoryId,
        id: param.id,
      };
+      console.warn(this.paramForm.options)
+      this.ops = this.paramForm.options
      this.modalType = 1;
      this.modalTitle = "修改参数";
      this.dialogParamsVisible = true;
@@ -194,7 +208,14 @@ export default {
      this.dialogParamsGroupVisible = true;
    },
    handleAddParamsGroup() {
+      this.paramGroupForm = {
+
+      };
+      this.ops = {
+
+      };
      (this.paramGroupForm.categoryId = this.categoryId), (this.modalType = 0);
+
      this.modalTitle = "添加参数组";
      this.dialogParamsGroupVisible = true;
    },
@@ -212,6 +233,7 @@ export default {
              }
            });
          } else {
+            console.warn(this.paramGroupForm)
            updateParamsGroup(this.paramGroupForm).then((res) => {
              this.submitLoading = false;
              if (res.success) {
@@ -242,6 +264,7 @@ export default {
              }
            });
          } else {
+            console.warn(this.paramForm.isIndex)
            this.paramForm.isIndex = Number(this.paramForm.isIndex);
            this.paramForm.required = Number(this.paramForm.required);
            updateGoodsParams(this.paramForm).then((res) => {
--- a/manager/src/views/goods/goods-review/index.vue
+++ b/manager/src/views/goods/goods-review/index.vue
@@ -53,7 +53,7 @@
        <div class="right-container">
          <div class="border-b">{{ infoData.goodsName }}</div>
          <div class="border-b">
-            <div class="div-height"> 店铺名称：{{ infoData.sellerName }}</div>
+            <div class="div-height"> 店铺名称：{{ infoData.storeName }}</div>
            <div class="div-height"> 订单号：{{ infoData.orderNo }}</div>
          </div>

--- a/manager/src/views/home/home.vue
+++ b/manager/src/views/home/home.vue
@@ -72,11 +72,11 @@
          <div class="counts">{{$store.state.notices.refund|| 0}}</div>
          <div>待审核售后</div>
        </div>
-        <div class="todo-item" @click="navigateTo('distribution')">
+        <div class="todo-item" >
          <div class="counts">{{$store.state.notices.distributionCash|| 0}}</div>
          <div>待审核分销提现</div>
        </div>
-        <div class="todo-item" @click="navigateTo('billList')">
+        <div class="todo-item" @click="navigateTo('accountStatementBill')">
          <div class="counts">{{$store.state.notices.waitPayBill|| 0}}</div>
          <div>待审核分账</div>
        </div>
--- a/manager/src/views/lili-components/multiple-region.vue
+++ b/manager/src/views/lili-components/multiple-region.vue
@@ -1,127 +0,0 @@
-<template>
-  <Modal :mask-closable="false" :value="switched" v-model="switched" title="选择地址" @on-ok="submit" @on-cancel="cancel">
-    <div class="flex">
-      <Spin size="large" fix v-if="spinShow"></Spin>
-      <Tree ref="tree" class="tree" :data="data" expand-node show-checkbox multiple></Tree>
-    </div>
-  </Modal>
-</template>
-<script>
-import { getAllCity } from "@/api/index";
-export default {
-  data() {
-    return {
-      switched: false, // 控制模态框显隐
-      spinShow: false, // 加载状态
-      data: [], // 地区数据
-      selectedWay: [], // 选择的地区
-      callBackData: "", // 打开组件的回显数据
-    };
-  },
-  mounted() {
-    this.init();
-  },
-  methods: {
-    cancel() {
-      this.switched = false;
-      // this.$emit("close",true)
-    },
-    open(val) {
-      if (val) {
-        this.callBackData = val;
-        this.data = JSON.parse(JSON.stringify(this.data));
-        val.areaId.split(",").forEach((ids) => {
-          this.data.forEach((item) => {
-            if (item.id == ids) {
-              item.selected = true;
-
-            }
-            item.children &&
-              item.children.forEach((child) => {
-                if (child.id == ids) {
-                  child.checked = true;
-                }
-              });
-          });
-        });
-
-        console.log(this.data);
-      }
-
-      this.switched = true;
-    },
-
-    submit() {
-      // 筛选出省市
-      let list = this.$refs.tree.getCheckedAndIndeterminateNodes();
-      let sort = [];
-      list.forEach((item) => {
-        item.selectedList = [];
-        if (item.level == "province") {
-          sort.push({
-            ...item,
-          });
-        }
-        sort.forEach((sortItem, sortIndex) => {
-          if (item.level != "province" && sortItem.id == item.parentId) {
-            sortItem.selectedList.push({
-              ...item,
-            });
-          }
-        });
-      });
-
-      this.$emit(
-        "selected",
-        list.filter((item) => {
-          return item.level == "province";
-        })
-      );
-
-      this.cancel();
-    },
-
-    init() {
-      getAllCity().then((res) => {
-        if (res.result) {
-          res.result.forEach((item) => {
-            item.children.forEach((child) => {
-              child.title = child.name;
-            });
-
-            let data = {
-              title: item.name,
-
-              ...item,
-            };
-            this.data.push(data);
-            this.selectedWay.push({ name: data.title, id: data.id });
-          });
-        }
-      });
-    },
-  },
-};
-</script>
-<style scoped lang="scss">
-.flex {
-  display: flex;
-  position: relative;
-}
-.tree {
-  flex: 2;
-}
-.form {
-  flex: 8;
-}
-.button-list {
-  margin-left: 80px;
-  > * {
-    margin: 0 4px;
-  }
-}
-/deep/ .ivu-modal-body {
-  height: 400px !important;
-  overflow: auto;
-}
-</style>
--- a/manager/src/views/lili-dialog/template/marketing.vue
+++ b/manager/src/views/lili-dialog/template/marketing.vue
@@ -147,7 +147,7 @@ export default {
              {
                style: {},
              },
-              this.$options.filters.unitPrice(params.row.price)
+              this.$options.filters.unitPrice(params.row.price, '￥')
            );
          },
        },
--- a/manager/src/views/member/list/index.vue
+++ b/manager/src/views/member/list/index.vue
@@ -40,11 +40,11 @@
        <FormItem label="手机号码" prop="mobile" style="width: 90%;">
          <Input v-model="addMemberForm.mobile" maxlength="11" placeholder="请输入手机号码" />
        </FormItem>
-        <FormItem label="会员名称" prop="username" style="width: 90%">
+        <FormItem label="会员名称" prop="uname" style="width: 90%">
          <Input v-model="addMemberForm.username" maxlength="15" placeholder="请输入会员名称" />
        </FormItem>

-        <FormItem label="会员密码" prop="password" style="width: 90%">
+        <FormItem label="会员密码" prop="pwd" style="width: 90%">
          <Input type="password" password v-model="addMemberForm.password" maxlength="20" placeholder="请输入会员密码" />
        </FormItem>
      </Form>
@@ -165,8 +165,8 @@ export default {
            message: "请输入正确的手机号",
          },
        ],
-        username: [{ required: true, message: "请输入会员名称" }],
-        password: [{ required: true, message: "请输入密码" }],
+        uname: [{ required: true, message: "请输入会员名称" }],
+        pwd: [{ required: true, message: "请输入密码" }],
      },
      ruleValidate: {}, //修改验证
      submitLoading: false, // 添加或编辑提交状态
--- a/manager/src/views/member/list/memberDetail.vue
+++ b/manager/src/views/member/list/memberDetail.vue
@@ -231,21 +231,21 @@
        </TabPane>
        <TabPane label="TA的余额" name="wallet">
          <div class="pointsTitle" style="justify-content: flex-start; text-align: left;">
-            <div style="width: 120px;">
+            <div style="min-width: 120px; margin-right:20px">
              <div class="points-top-title">
                余额
              </div>

              <div class="points-top-text">
-                {{memberWalletInfo.memberDeposit?memberWalletInfo.memberDeposit:0 | unitPrice('￥')}}
+                {{memberWalletInfo.memberWallet?memberWalletInfo.memberWallet:0 | unitPrice('￥')}}
              </div>
            </div>
-            <div style="width: 120px;">
+            <div style="min-width: 120px;">
              <div class="points-top-title">
                冻结余额
              </div>
              <div class="points-top-text">
-                {{memberWalletInfo.frozenDeposit?memberWalletInfo.frozenDeposit:0 | unitPrice('￥')}}
+                {{memberWalletInfo.memberFrozenWallet?memberWalletInfo.memberFrozenWallet:0 | unitPrice('￥')}}
              </div>
            </div>
          </div>
@@ -750,23 +750,23 @@
            minWidth: 120,
          },
          {
-            title: "业务类型",
-            key: "serviceType",
-            width: 150,
-            render: (h, params) => {
-              if (params.row.serviceType == "BALANCE_WITHDRAWAL") {
-                return h('div', [h('span', {}, '余额提现'),]);
-              } else if (params.row.serviceType == "BALANCE_PAY") {
-                return h('div', [h('span', {}, '余额支付'),]);
-              } else if (params.row.serviceType == "BALANCE_REFUND") {
-                return h('div', [h('span', {}, '余额退款'),]);
-              } else if (params.row.serviceType == "BALANCE_RECHARGE") {
-                return h('div', [h('span', {}, '余额充值'),]);
-              } else if (params.row.serviceType == "BALANCE_COMMISSION") {
-                return h('div', [h('span', {}, '佣金提成'),]);
-              }
+          title: "业务类型",
+          key: "serviceType",
+          width: 200,
+          render: (h, params) => {
+            if (params.row.serviceType == "WALLET_WITHDRAWAL") {
+              return h("div", [h("span", {}, "余额提现")]);
+            } else if (params.row.serviceType == "WALLET_PAY") {
+              return h("div", [h("span", {}, "余额支付")]);
+            } else if (params.row.serviceType == "WALLET_REFUND") {
+              return h("div", [h("span", {}, "余额退款")]);
+            } else if (params.row.serviceType == "WALLET_RECHARGE") {
+              return h("div", [h("span", {}, "余额充值")]);
+            } else {
+              return h("div", [h("span", {}, "佣金提成")]);
            }
          },
+        },
          {
            title: "变动金额",
            key: "money",
--- a/manager/src/views/my-components/lili/upload-pic-thumb.vue
+++ b/manager/src/views/my-components/lili/upload-pic-thumb.vue
@@ -9,7 +9,7 @@
      @end="onEnd"
    >
      <div class="upload-list" v-for="(item, index) in uploadList" :key="index">
-        <div v-if="item.status == 'finished'">
+        <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>
--- a/manager/src/views/order/after-order/afterSaleOrder.vue
+++ b/manager/src/views/order/after-order/afterSaleOrder.vue
@@ -29,10 +29,8 @@
                  <Option value="PASS">通过售后</Option>
                  <Option value="REFUSE">拒绝售后</Option>
                  <Option value="BUYER_RETURN">买家退货，待卖家收货</Option>
-                  <Option value="SELLER_RE_DELIVERY">商家换货/补发</Option>
                  <Option value="SELLER_CONFIRM">卖家确认收货</Option>
                  <Option value="SELLER_TERMINATION">卖家终止售后</Option>
-                  <Option value="BUYER_CONFIRM">买家确认收货</Option>
                  <Option value="BUYER_CANCEL">买家取消售后</Option>
                  <Option value="COMPLETE">完成售后</Option>
                </Select>
@@ -48,10 +46,10 @@
                  style="width: 200px"
                ></DatePicker>
              </Form-item>
-              <Form-item label="商家名称" prop="sellerName">
+              <Form-item label="商家名称" prop="storeName">
                <Input
                  type="text"
-                  v-model="searchForm.sellerName"
+                  v-model="searchForm.storeName"
                  placeholder="请输入商家名称"
                  clearable
                  style="width: 200px"
@@ -149,7 +147,7 @@
          orderSn: "",
          memberName: "",
          serviceStatus: "",
-          sellerName:"",
+          storeName:"",
          sn: "",

        },
@@ -157,7 +155,7 @@
        form: {
          // 添加或编辑表单对象初始化数据
          sn: "",
-          sellerName: "",
+          storeName: "",
          startTime: "",
          endTime: "",
          billPrice: "",
--- a/manager/src/views/order/after-order/afterSaleOrderDetail.vue
+++ b/manager/src/views/order/after-order/afterSaleOrderDetail.vue
@@ -63,14 +63,13 @@
            </div>

            <div class="div-form-default" v-if="afterSaleInfo.serviceStatus=='APPLY'">
-              <h3>商家处理意见</h3>
+              <h3>处理意见</h3>
              <dl>
                <dt>商家</dt>
                <dd>
                  <div class="div-content">
                    {{afterSaleInfo.storeName}}
                  </div>
-
                </dd>
              </dl>
              <dl>
@@ -86,9 +85,18 @@
                      </Radio>
                    </RadioGroup>
                  </div>
-
                </dd>
              </dl>
+              <dl>
+                  <dt>申请退款金额</dt>
+                  <dd>{{ afterSaleInfo.applyRefundPrice | unitPrice('￥') }}</dd>
+                </dl>
+                <dl>
+                  <dt>实际退款金额</dt>
+                  <dd>
+                    <Input v-model="params.actualRefundPrice" style="width:260px"/>
+                  </dd>
+                </dl>
              <dl>
                <dt>备注信息</dt>
                <dd>
@@ -169,7 +177,7 @@

            </div>
            <!--"-->
-            <div class="div-form-default" v-if="afterSaleInfo.afterSaleAllowOperationVO.refund">
+            <div class="div-form-default" v-if="afterSaleInfo.afterSaleAllowOperationVO && afterSaleInfo.afterSaleAllowOperationVO.refund">
              <h3>平台退款</h3>

              <dl>
@@ -438,10 +446,10 @@ export default {
          this.afterSaleInfo = res.result;
          this.afterSaleImage = (res.result.afterSaleImage || "").split(",");
          //退货地址去掉逗号
-          this.afterSaleInfo.mconsigneeAddressPath = this.afterSaleInfo.mconsigneeAddressPath.replaceAll(
-            ",",
-            " "
-          );
+          if (this.afterSaleInfo.mconsigneeAddressPath)
+          this.afterSaleInfo.mconsigneeAddressPath = this.afterSaleInfo.mconsigneeAddressPath.replaceAll(","," ");
+
+          this.$set(this.params,'actualRefundPrice', this.afterSaleInfo.applyRefundPrice)
        }
      });
    },
@@ -538,6 +546,10 @@ export default {
        this.$Message.error("请输入备注信息");
        return;
      }
+      if (this.params.actualRefundPrice == "") {
+        this.$Message.error("请输入退款金额");
+        return;
+      }
      API_Order.afterSaleSellerReview(this.sn, this.params).then((res) => {
        this.submitLoading = false;
        if (res.success) {
--- a/manager/src/views/order/flow/paymentLog.vue
+++ b/manager/src/views/order/flow/paymentLog.vue
@@ -2,35 +2,41 @@
  <div class="search">
    <Row>
      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Form-item label="订单号" prop="sn">
-                <Input type="text" v-model="searchForm.sn" placeholder="订单/交易号" clearable style="width: 200px"/>
-              </Form-item>
-              <Form-item label="付款状态" prop="orderStatus">
-                <Select v-model="searchForm.payStatus" placeholder="请选择" clearable style="width: 200px">
-                  <Option value="UNPAID">未付款</Option>
-                  <Option value="PAID">已付款</Option>
-                </Select>
-              </Form-item>
-              <Form-item label="支付时间">
-                <DatePicker v-model="searchForm" type="datetimerange" format="yyyy-MM-dd" clearable
-                            @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
-              </Form-item>
-              <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
-            </Form>
-          </Row>
-          <Row class="padding-row">
-            <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
-                   @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
-          </Row>
-          <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>
-          </Row>
-        </Card>
+      <Card>
+        <Row @keydown.enter.native="handleSearch">
+          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+            <Form-item label="订单号" prop="sn">
+              <Input type="text" v-model="searchForm.sn" placeholder="订单/交易号" clearable style="width: 200px" />
+            </Form-item>
+            <Form-item label="付款状态" prop="orderStatus">
+              <Select v-model="searchForm.payStatus" placeholder="请选择" clearable style="width: 200px">
+                <Option value="UNPAID">未付款</Option>
+                <Option value="PAID">已付款</Option>
+              </Select>
+            </Form-item>
+            <Form-item label="支付方式" prop="orderStatus">
+              <Select v-model="searchForm.paymentMethod" placeholder="请选择" clearable style="width: 200px">
+                <Option value="WECHAT">微信</Option>
+                <Option value="ALIPAY">支付宝</Option>
+                <Option value="WALLET">余额</Option>
+                <Option value="BANK_TRANSFER">银行转账</Option>
+                <Option value="">暂未付款</Option>
+              </Select>
+            </Form-item>
+            <Form-item label="支付时间">
+              <DatePicker v-model="searchForm" type="datetimerange" format="yyyy-MM-dd" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
+            </Form-item>
+            <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          </Form>
+        </Row>
+        <Row class="padding-row">
+          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+        </Row>
+        <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>
+        </Row>
+      </Card>
      </Col>
    </Row>
  </div>
@@ -68,16 +74,57 @@ export default {
        {
          title: "支付方式",
          key: "paymentMethod",
-          width: 100,
+          width: 120,
+          align: "center",
          render: (h, params) => {
            if (params.row.paymentMethod === "WECHAT") {
-              return h("div", [h("span", {}, "微信")]);
+              return h("div", [
+                h(
+                  "Tag",
+                  {
+                    props: {
+                      color: "green",
+                    },
+                  },
+                  "微信"
+                ),
+              ]);
            } else if (params.row.paymentMethod === "ALIPAY") {
-              return h("div", [h("span", {}, "支付宝")]);
+              return h("div", [
+                h(
+                  "Tag",
+                  {
+                    props: {
+                      color: "blue",
+                    },
+                  },
+                  "支付宝"
+                ),
+              ]);
            } else if (params.row.paymentMethod === "WALLET") {
-              return h("div", [h("span", {}, "余额支付")]);
+              return h("div", [
+                h(
+                  "Tag",
+                  {
+                    props: {},
+                  },
+                  "余额支付"
+                ),
+              ]);
            } else if (params.row.paymentMethod === "BANK_TRANSFER") {
-              return h("div", [h("span", {}, "银行转帐")]);
+              return h("div", [
+                h(
+                  "Tag",
+                  {
+                    props: {
+                      color: "orange",
+                    },
+                  },
+                  "银行转帐"
+                ),
+              ]);
+            } else {
+              return h("div", [h("Tag", {}, "暂未付款")]);
            }
          },
        },
@@ -85,19 +132,24 @@ export default {
          title: "第三方流水",
          key: "receivableNo",
          minWidth: 130,
+          render: (h, params) => {
+            return h("div", [
+              h("span", {}, params.row.receivableNo || "暂无流水号"),
+            ]);
+          },
        },
        {
          title: "客户端",
          key: "clientType",
          width: 130,
          render: (h, params) => {
-            if (params.row.clientType === "WECHAT_MP") {
+            if (params.row.clientType === "WECHAT_MP" || params.row.clientType === '小程序') {
              return h("div", [h("span", {}, "小程序")]);
            } else if (params.row.clientType === "APP") {
              return h("div", [h("span", {}, "APP")]);
            } else if (params.row.clientType === "PC") {
              return h("div", [h("span", {}, "PC网页")]);
-            } else if (params.row.clientType === "H5") {
+            } else if (params.row.clientType === "H5" || params.row.clientType === 'wap') {
              return h("div", [h("span", {}, "移动端")]);
            }
          },
@@ -106,6 +158,11 @@ export default {
          title: "支付时间",
          key: "paymentTime",
          width: 200,
+          render: (h, params) => {
+            return h("div", [
+              h("span", {}, params.row.paymentTime || "暂无支付时间"),
+            ]);
+          },
        },
        {
          title: "订单金额",
@@ -204,7 +261,7 @@ export default {
      });
      this.total = this.data.length;
      this.loading = false;
-    }
+    },
  },
  mounted() {
    this.init();
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -93,6 +93,20 @@ export default {
          title: "订单来源",
          key: "clientType",
          width: 95,
+          render: (h, params) => {
+            if (params.row.clientType == "H5") {
+              return h("div",{},"移动端");
+            }else if(params.row.clientType == "PC") {
+              return h("div",{},"PC端");
+            }else if(params.row.clientType == "WECHAT_MP") {
+              return h("div",{},"小程序端");
+            }else if(params.row.clientType == "APP") {
+              return h("div",{},"移动应用端");
+            }
+            else{
+               return h("div",{},params.row.clientType);
+            }
+          },
        },
        {
          title: "买家名称",
@@ -251,7 +265,8 @@ export default {
    confirmPrice(v) {
      this.$Modal.confirm({
        title: "提示",
-        content: "<p>您确定要收款吗？线下收款涉及库存变更，需异步进行，等待约一分钟刷新列表查看</p>",
+        content:
+          "<p>您确定要收款吗？线下收款涉及库存变更，需异步进行，等待约一分钟刷新列表查看</p>",
        onOk: () => {
          API_Order.orderPay(v.sn).then((res) => {
            if (res.success) {
--- a/manager/src/views/page/article-manage/articleList.vue
+++ b/manager/src/views/page/article-manage/articleList.vue
@@ -41,38 +41,38 @@
          </Page>
        </Row>

-          <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="1100">
-            <Form ref="form" :model="form" :label-width="100">
-              <FormItem label="文章标题" prop="title">
-                <Input v-model="form.title" clearable style="width: 40%" />
-              </FormItem>
-              <FormItem label="文章分类" prop="categoryId">
-                <Select v-model="treeValue" placeholder="请选择" clearable style="width: 180px">
-                  <Option :value="treeValue" style="display: none">{{
+        <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="1100">
+          <Form ref="form" :model="form" :label-width="100">
+            <FormItem label="文章标题" prop="title">
+              <Input v-model="form.title" clearable style="width: 40%" />
+            </FormItem>
+            <FormItem label="文章分类" prop="categoryId">
+              <Select v-model="treeValue" placeholder="请选择" clearable style="width: 180px">
+                <Option :value="treeValue" style="display: none">{{
                        treeValue
                      }}
-                  </Option>
-                  <Tree :data="treeData" @on-select-change="handleCheckChange"></Tree>
-                </Select>
-              </FormItem>
-              <FormItem label="文章排序" prop="sort">
-                <Input type="number" v-model="form.sort" clearable style="width: 10%" />
-              </FormItem>
-              <FormItem class="form-item-view-el" label="文章内容" prop="content">
-                <editor v-model="form.content"></editor>
-              </FormItem>
-              <FormItem label="是否展示" prop="openStatus">
-                <i-switch size="large" v-model="form.openStatus" :true-value="open" :false-value="close">
-                  <span slot="open">展示</span>
-                  <span slot="close">隐藏</span>
-                </i-switch>
-              </FormItem>
-            </Form>
-            <div slot="footer">
-              <Button type="text" @click="modalVisible = false">取消</Button>
-              <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
-            </div>
-          </Modal>
+                </Option>
+                <Tree :data="treeData" @on-select-change="handleCheckChange"></Tree>
+              </Select>
+            </FormItem>
+            <FormItem label="文章排序" prop="sort">
+              <Input type="number" v-model="form.sort" clearable style="width: 10%" />
+            </FormItem>
+            <FormItem class="form-item-view-el" label="文章内容" prop="content">
+              <editor v-model="form.content"></editor>
+            </FormItem>
+            <FormItem label="是否展示" prop="openStatus">
+              <i-switch size="large" v-model="form.openStatus" :true-value="open" :false-value="close">
+                <span slot="open">展示</span>
+                <span slot="close">隐藏</span>
+              </i-switch>
+            </FormItem>
+          </Form>
+          <div slot="footer">
+            <Button type="text" @click="modalVisible = false">取消</Button>
+            <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
+          </div>
+        </Modal>
      </Card>
      </Col>

@@ -123,6 +123,7 @@ export default {
      searchTreeValue: "", // 切换
      form: {
        // 添加或编辑表单对象初始化数据
+        openStatus:false,
        title: "",
        categoryId: "",
        sort: 1,
@@ -347,7 +348,7 @@ export default {
            level: 0,
            children: [],
            id: "0",
-            categoryId: 0
+            categoryId: 0,
          });
        }
      });
@@ -379,13 +380,7 @@ export default {
          //为了在是否展示一列展示开关 需要改一下数据类型，最终提交再次更改
          this.data = [];
          if (res.result.records.length > 0) {
-            res.result.records.forEach((item) => {
-              if (item.openStatus == "OPEN") {
-                item.openStatus = true;
-              } else {
-                item.openStatus = false;
-              }
-            })
+
            this.data = res.result.records;
          }
        }
@@ -395,11 +390,7 @@ export default {
    },

    handleSubmit() {
-      if (this.form.openStatus) {
-        this.form.openStatus = "OPEN";
-      } else {
-        this.form.openStatus = "CLOSE";
-      }
+
      this.$refs.form.validate((valid) => {
        if (valid) {
          this.submitLoading = true;
@@ -412,6 +403,7 @@ export default {
                this.$Message.success("操作成功");
                this.getDataList();
                this.modalVisible = false;
+
              }
            });
          } else {
@@ -422,6 +414,8 @@ export default {
                this.$Message.success("操作成功");
                this.getDataList();
                this.modalVisible = false;
+
+
              }
            });
          }
@@ -449,11 +443,7 @@ export default {
          this.form.content = res.result.content;
          this.form.title = res.result.title;
          this.form.sort = res.result.sort;
-          if (res.result.openStatus == "OPEN") {
-            this.form.openStatus = true;
-          } else {
-            this.form.openStatus = false;
-          }
+            this.form.openStatus = res.result.openStatus
        }
      });
    },
--- a/manager/src/views/promotion/coupon/coupon.vue
+++ b/manager/src/views/promotion/coupon/coupon.vue
@@ -174,7 +174,6 @@ export default {
        {
          title: "领取数量/总数量",
          key: "publishNum",
-          width: 150,
          render: (h, params) => {
            return h(
              "div", params.row.receivedNum + "/" + params.row.publishNum)
@@ -214,7 +213,6 @@ export default {
        },
        {
          title: "活动时间",
-          minWidth: 120,
          render: (h, params) => {
            return h("div", {
              domProps:
--- a/manager/src/views/promotion/coupon/couponInfo.vue
+++ b/manager/src/views/promotion/coupon/couponInfo.vue
@@ -14,7 +14,7 @@
              }}</span>
            </FormItem>
            <FormItem label="面额">
-              <span class="goods-category-name"> ￥{{ form.price }}</span>
+              <span class="goods-category-name"> ￥{{ form.price | unitPrice }}</span>
            </FormItem>
            <FormItem label="活动说明">
              <span class="goods-category-name">{{ form.description }}</span>
--- a/manager/src/views/promotion/coupon/couponPublish.vue
+++ b/manager/src/views/promotion/coupon/couponPublish.vue
@@ -49,11 +49,15 @@
            <FormItem label="领取限制" prop="couponLimitNum">
              <Input v-model="form.couponLimitNum" placeholder="领取限制" clearable style="width: 260px" />
            </FormItem>
-            <FormItem label="有效期" prop="startTime">
-              <DatePicker type="datetime" v-model="form.startTime" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择" :options="options" clearable style="width: 200px">
-              </DatePicker>
-              -
-              <DatePicker type="datetime" v-model="form.endTime" format="yyyy-MM-dd HH:mm:ss" :options="options" placeholder="请选择" clearable style="width: 200px">
+            <FormItem label="有效期" prop="rangeTime">
+              <DatePicker
+                type="datetimerange"
+                v-model="form.rangeTime"
+                format="yyyy-MM-dd HH:mm:ss"
+                placeholder="请选择"
+                :options="options"
+                style="width: 260px"
+              >
              </DatePicker>
            </FormItem>
            <FormItem label="使用范围" prop="scopeType">
@@ -135,20 +139,6 @@ export default {
        callback();
      }
    };
-    const isLtEndDate = (rule, value, callback) => {
-      if (new Date(value).getTime() > new Date(this.form.endTime).getTime()) {
-        callback(new Error());
-      } else {
-        callback();
-      }
-    };
-    const isGtStartDate = (rule, value, callback) => {
-      if (new Date(value).getTime() < new Date(this.form.startTime).getTime()) {
-        callback(new Error());
-      } else {
-        callback();
-      }
-    };
    return {
      modalType: 0, // 是否编辑
      form: {
@@ -186,34 +176,11 @@ export default {
          { required: true, message: "请输入面额" },
          { validator: checkPrice },
        ],
+        rangeTime: [{ required: true, message: "请选择优惠券有效期" }],
        consumeThreshold: [
          { required: true, message: "请输入消费门槛" },
          { validator: checkWeight },
        ],
-        startTime: [
-          {
-            required: true,
-            type: "date",
-            message: "请选择开始时间",
-          },
-          {
-            trigger: "change",
-            message: "开始时间要小于结束时间",
-            validator: isLtEndDate,
-          },
-        ],
-        endTime: [
-          {
-            required: true,
-            type: "date",
-            message: "请选择结束时间",
-          },
-          {
-            trigger: "change",
-            message: "结束时间要大于开始时间",
-            validator: isGtStartDate,
-          },
-        ],
        couponDiscount: [
          { required: true, message: "请输入折扣" },
          {
@@ -337,6 +304,8 @@ export default {
          next(this.goodsCategoryList, []);
          data.scopeIdGoods = prevCascader;
        }
+        data.rangeTime = [];
+        data.rangeTime.push(new Date(data.startTime), new Date(data.endTime));
        this.form = data;
      });
    },
@@ -345,15 +314,14 @@ export default {
      this.$refs.form.validate((valid) => {
        if (valid) {
          const params = JSON.parse(JSON.stringify(this.form));
-          const strat = this.$options.filters.unixToDate(
-            this.form.startTime / 1000
+          params.startTime = this.$options.filters.unixToDate(
+            this.form.rangeTime[0] / 1000
          );
-          const end = this.$options.filters.unixToDate(
-            this.form.endTime / 1000
+          params.endTime = this.$options.filters.unixToDate(
+            this.form.rangeTime[1] / 1000
          );
+          delete params.rangeTime
          let scopeId = [];
-          params.startTime = strat;
-          params.endTime = end;

          if (
            params.scopeType == "PORTION_GOODS" &&
--- a/manager/src/views/promotion/pointsGoods/editPointsGoods.vue
+++ b/manager/src/views/promotion/pointsGoods/editPointsGoods.vue
@@ -15,7 +15,7 @@
              <div>{{ form.goodsSku.sellerName }}</div>
            </FormItem>
            <FormItem label="商品价格" prop="goodsPrice">
-              <div>{{ form.goodsSku.price }}</div>
+              <div>{{ form.goodsSku.price | unitPrice('￥') }}</div>
            </FormItem>
            <FormItem label="库存" prop="quantity">
              <div>{{ form.goodsSku.quantity }}</div>
--- a/manager/src/views/promotion/pointsGoodsCategory/pointsGoodsCategory.vue
+++ b/manager/src/views/promotion/pointsGoodsCategory/pointsGoodsCategory.vue
@@ -17,16 +17,9 @@
      primary-key="id"
    >
      <template slot="action" slot-scope="scope">
-        <Dropdown transfer="true" trigger="click">
-          <Button type="primary" size="small">
-            操作
-            <Icon type="ios-arrow-down"></Icon>
-          </Button>
-          <DropdownMenu slot="list">
-            <DropdownItem @click.native="edit(scope.row)">编辑</DropdownItem>
-            <DropdownItem @click.native="remove(scope.row)">删除</DropdownItem>
-          </DropdownMenu>
-        </Dropdown>
+        <Button @click.native="edit(scope.row)" style="margin-right:10px;" size="small">编辑</Button>
+        <Button @click.native="remove(scope.row)" type="primary" size="small">删除</Button>
+
      </template>
    </tree-table>

--- a/manager/src/views/seller/bill/accountStatementBill.vue
+++ b/manager/src/views/seller/bill/accountStatementBill.vue
@@ -12,6 +12,7 @@
              <DatePicker v-model="selectDate" type="daterange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px">
              </DatePicker>
            </Form-item>
+
            <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
          </Form>
        </Row>
--- a/manager/src/views/seller/bill/bill.vue
+++ b/manager/src/views/seller/bill/bill.vue
@@ -6,18 +6,20 @@
        <Row @keydown.enter.native="handleSearch">
          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
            <Form-item label="账单编号" prop="sn">
-              <Input
-                type="text"
-                v-model="searchForm.sn"
-                placeholder="请输入账单编号"
-                clearable
-                style="width: 200px"
-              />
+              <Input type="text" v-model="searchForm.sn" placeholder="请输入账单编号" clearable style="width: 200px" />
            </Form-item>
            <Form-item label="出帐时间" prop="createTime">
              <DatePicker v-model="selectDate" type="daterange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px">
              </DatePicker>
            </Form-item>
+            <Form-item label="筛选状态">
+              <Select v-model="searchForm.billStatus" style="width:160px">
+                <Option value="">全部</Option>
+                <Option value="OUT">已出账</Option>
+                <Option value="CHECK">已核对</Option>
+                <Option value="COMPLETE">已完成</Option>
+              </Select>
+            </Form-item>
            <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
          </Form>
        </Row>
@@ -26,14 +28,11 @@
          <Button @click="delAll">批量删除</Button>
        </Row>
        <Row>
-          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
-                 @on-sort-change="changeSort"
-                 @on-selection-change="changeSelect">
+          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
          </Table>
        </Row>
        <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]"
+          <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>
@@ -88,6 +87,7 @@ export default {
        order: "desc", // 默认排序方式
        startDate: "", // 起始时间
        endDate: "", // 终止时间
+        billStatus:"" //状态
      },
      selectDate: null, // 选择一个时间段
      form: {
@@ -114,7 +114,7 @@ export default {
          title: "账单号",
          key: "sn",
          minWidth: 200,
-          tooltip: true
+          tooltip: true,
        },
        {
          title: "生成时间",
@@ -126,14 +126,14 @@ export default {
          key: "startTime",
          width: 200,
          render: (h, params) => {
-            return h('div', params.row.startTime +"~"+params.row.endTime)
-          }
+            return h("div", params.row.startTime + "~" + params.row.endTime);
+          },
        },
        {
          title: "店铺名称",
          key: "storeName",
          minWidth: 120,
-          tooltip: true
+          tooltip: true,
        },

        {
@@ -152,16 +152,16 @@ export default {
          key: "billStatus",
          width: 100,
          render: (h, params) => {
-            if(params.row.billStatus == 'OUT'){
-              return h('div', '已出账')
-            } else if (params.row.billStatus == 'CHECK') {
-              return h('div', '已对账')
-            } else if (params.row.billStatus == 'EXAMINE') {
-              return h('div', '已审核')
-            }else{
-              return h('div', '已付款')
+            if (params.row.billStatus == "OUT") {
+              return h("div", "已出账");
+            } else if (params.row.billStatus == "CHECK") {
+              return h("div", "已对账");
+            } else if (params.row.billStatus == "EXAMINE") {
+              return h("div", "已审核");
+            } else {
+              return h("div", "已付款");
            }
-          }
+          },
        },
        {
          title: "操作",
--- a/manager/src/views/seller/shop/shopAuditList.vue
+++ b/manager/src/views/seller/shop/shopAuditList.vue
@@ -99,6 +99,15 @@
            key: "storeAddressPath",
            width: 300,
            sortable: false,
+            render: (h, params) => {
+            return h(
+              "Tag",
+              {
+
+              },
+              params.row.storeAddressPath ||  "暂未填写"
+            );
+          },
          },
          {
            title: "是否自营",
--- a/manager/src/views/seller/shop/shopList.vue
+++ b/manager/src/views/seller/shop/shopList.vue
@@ -111,7 +111,16 @@ export default {
          title: "店铺地址",
          key: "storeAddressPath",
          width: 300,
-          tooltip: true
+          tooltip: true,
+          render: (h, params) => {
+            return h(
+              "Tag",
+              {
+
+              },
+              params.row.storeAddressPath ||  "暂未填写"
+            );
+          },
        },
        {
          title: "是否自营",
--- a/manager/src/views/statistics/goods.vue
+++ b/manager/src/views/statistics/goods.vue
@@ -54,7 +54,7 @@ export default {
          render: (h, params) => {
            return h(
              "div",
-              this.$options.filters.unitPrice(params.row.price)
+              this.$options.filters.unitPrice(params.row.price, '￥')
            );
          },
        },
--- a/manager/src/views/sys/app-version/appVersion.vue
+++ b/manager/src/views/sys/app-version/appVersion.vue
@@ -2,84 +2,46 @@
  <div class="search">
    <Row>
      <Col>
-        <Card>
-          <Row @keydown.enter.native="handleSearch">
-            <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-              <Form-item label="系统类型" prop="orderSn">
-                <Select
-                  v-model="searchForm.type"
-                  placeholder="请选择系统类型"
-                  clearable
-                  style="width: 200px"
-                >
-                  <Option value="IOS">苹果</Option>
-                  <Option value="ANDROID">安卓</Option>
-                </Select>
-              </Form-item>
-              <Form-item style="margin-left:-35px;" class="br">
-                <Button @click="handleSearch" type="primary" icon="ios-search">搜索</Button>
-              </Form-item>
-            </Form>
-          </Row>
-          <Row class="operation" style="margin-top: 20px">
-            <Button @click="addAppVersion" type="primary">添加</Button>
-          </Row>
-          <Row class="padding-row">
-            <Table
-              :loading="loading"
-              border
-              :columns="columns"
-              :data="data"
-              ref="table"
-              sortable="custom"
-              @on-sort-change="changeSort"
-              @on-selection-change="changeSelect"
-            ></Table>
-          </Row>
-          <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>
-          </Row>
-        </Card>
+      <Card>
+        <Row @keydown.enter.native="handleSearch">
+          <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+            <Form-item label="系统类型" prop="orderSn">
+              <Select v-model="searchForm.type" placeholder="请选择系统类型" clearable style="width: 200px">
+                <Option value="IOS">苹果</Option>
+                <Option value="ANDROID">安卓</Option>
+              </Select>
+            </Form-item>
+            <Button @click="handleSearch" type="primary" icon="ios-search">搜索</Button>
+          </Form>
+        </Row>
+        <Row class="operation" style="margin-top: 20px">
+          <Button @click="addAppVersion" type="primary">添加</Button>
+        </Row>
+        <Row class="padding-row">
+          <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
+        </Row>
+        <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>
+        </Row>
+      </Card>
      </Col>
    </Row>
-    <Modal
-      :title="modalTitle"
-      v-model="modalVisible"
-      :mask-closable="false"
-      :width="1000"
-    >
+    <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="1000">
      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
        <FormItem label="版本名称" prop="versionName">
-          <Input v-model="form.versionName" maxlength="15" clearable style="width: 40%"/>
+          <Input v-model="form.versionName" maxlength="15" clearable style="width: 40%" />
        </FormItem>
        <FormItem label="版本号" prop="version">
-          <Input v-model="form.version" maxlength="15" clearable style="width: 40%"/>
+          <Input v-model="form.version" maxlength="15" clearable style="width: 40%" />
        </FormItem>
        <FormItem label="更新时间" prop="versionUpdateDate">
-          <DatePicker
-            v-model="form.versionUpdateDate"
-            type="datetime"
-            format="yyyy-MM-dd HH:mm:ss"
-            clearable
-            placeholder="请选择"
-            style="width: 200px"
-          ></DatePicker>
+          <DatePicker v-model="form.versionUpdateDate" type="datetime" format="yyyy-MM-dd HH:mm:ss" clearable placeholder="请选择" style="width: 200px"></DatePicker>
        </FormItem>
        <FormItem label="强制更新">
          <RadioGroup type="button" button-style="solid" v-model="form.forceUpdate">
-            <Radio label="1">强制更新</Radio>
-            <Radio label="0">非强制更新</Radio>
+            <Radio :label="true">强制更新</Radio>
+            <Radio :label="false">非强制更新</Radio>
          </RadioGroup>
        </FormItem>
        <FormItem label="类型">
@@ -89,10 +51,10 @@
          </RadioGroup>
        </FormItem>
        <FormItem label="下载地址" prop="downloadUrl">
-          <Input v-model="form.downloadUrl" maxlength="100" clearable style="width: 40%"/>
+          <Input v-model="form.downloadUrl" maxlength="100" clearable style="width: 40%" />
        </FormItem>
        <FormItem class="form-item-view-el" label="更新内容" prop="content">
-          <editor v-model="form.content"></editor>
+             <Input v-model="form.content" :rows="6" maxlength="100" show-word-limit type="textarea" placeholder="Enter something..."  />
        </FormItem>
      </Form>
      <div slot="footer">
@@ -102,11 +64,7 @@
    </Modal>
    <div>
      <!-- 查看版本信息 -->
-      <Modal
-        :title="queryModalTitle"
-        v-model="queryModalVisible"
-        :width="700"
-      >
+      <Modal :title="queryModalTitle" v-model="queryModalVisible" :width="700">
        <Form>
          <div class="div-version">
            <FormItem label="版本名称:">
@@ -150,315 +108,308 @@
 </template>

 <script>
-  import * as API_Setting from "@/api/setting";
-  import editor from "@/views/my-components/lili/editor";
+import * as API_Setting from "@/api/setting";

+export default {
+  name: "orderList",
+  components: {

-  export default {
-    name: "orderList",
-    components: {
-      editor
-    },
-    data() {
-      return {
-        queryModalVisible: false, // 版本信息modal
-        queryModalTitle: "查看更新信息", // modal标题
-        loading: true, // 表单加载状态
-        modalVisible: false, // 添加app版本模态框
-        modalTitle: "", // 添加app版本标题
-        modalType: 0, // 新增、编辑标识
-        searchForm: {
-          // 搜索框初始化对象
-          pageNumber: 1, // 当前页数
-          pageSize: 10, // 页面大小
-          sort: "createTime", // 默认排序字段
-          order: "desc", // 默认排序方式
-          type: ""
+  },
+  data() {
+    return {
+      queryModalVisible: false, // 版本信息modal
+      queryModalTitle: "查看更新信息", // modal标题
+      loading: true, // 表单加载状态
+      modalVisible: false, // 添加app版本模态框
+      modalTitle: "", // 添加app版本标题
+      modalType: 0, // 新增、编辑标识
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "createTime", // 默认排序字段
+        order: "desc", // 默认排序方式
+        type: "",
+      },
+      form: {
+        // 添加或编辑表单对象初始化数据
+        versionName: "",
+        version: "",
+        forceUpdate: 1,
+        type: "IOS",
+        downloadUrl: "",
+        content: "",
+        versionUpdateDate: "",
+      },
+      versionUpdateDate: "", // 更新时间
+      // 表单验证规则
+      formValidate: {
+        version: [
+          { required: true, message: "版本号不能为空", trigger: "blur" },
+        ],
+        versionName: [
+          { required: true, message: "版本名称不能为空", trigger: "blur" },
+        ],
+        downloadUrl: [
+          { required: true, message: "下载地址不能为空", trigger: "blur" },
+        ],
+        versionUpdateDate: [{ required: true, message: "更新时间不能为空" }],
+      },
+      submitLoading: false, // 添加或编辑提交状态
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        {
+          title: "版本名称",
+          key: "versionName",
+          minWidth: 100,
        },
-        form: {
-          // 添加或编辑表单对象初始化数据
-          versionName: "",
-          version: "",
-          forceUpdate: 1,
-          type: "IOS",
-          downloadUrl: "",
-          content: "",
-          versionUpdateDate: ""
+        {
+          title: "版本号",
+          key: "version",
+          minWidth: 120,
        },
-        versionUpdateDate: "", // 更新时间
-        // 表单验证规则
-        formValidate: {
-          version: [
-            {required: true, message: '版本号不能为空', trigger: 'blur'},
-          ],
-          versionName: [
-            {required: true, message: '版本名称不能为空', trigger: 'blur'},
-          ],
-          downloadUrl: [
-            {required: true, message: '下载地址不能为空', trigger: 'blur'},
-          ],
-          versionUpdateDate: [{required: true, message: "更新时间不能为空"}],
-
-        },
-        submitLoading: false, // 添加或编辑提交状态
-        selectList: [], // 多选数据
-        selectCount: 0, // 多选计数
-        columns: [
-          {
-            title: "版本名称",
-            key: "versionName",
-            minWidth: 100,
+        {
+          title: "强制更新",
+          key: "forceUpdate",
+          width: 100,
+          render: (h, params) => {
+            return h(
+              "div",
+              {
+                props: {
+                  color: params.row.forceUpdate ? "primary" : "default",
+                },
+              },
+              params.row.forceUpdate == 0 ? "非强制" : "强制"
+            );
          },
-          {
-            title: "版本号",
-            key: "version",
-            minWidth: 120,
+        },
+        {
+          title: "类型",
+          key: "type",
+          minWidth: 80,
+          render: (h, params) => {
+            if (params.row.type == "IOS") {
+              return h("div", [h("span", {}, "苹果")]);
+            } else {
+              return h("div", [h("span", {}, "安卓")]);
+            }
          },
-          {
-            title: "强制更新",
-            key: "forceUpdate",
-            width: 100,
-            render: (h, params) => {
+        },

-              return h(
-                "div",
+        {
+          title: "更新时间",
+          key: "versionUpdateDate",
+          minWidth: 120,
+          sortable: true,
+        },
+
+        {
+          title: "操作",
+          key: "action",
+          align: "center",
+          width: 230,
+          render: (h, params) => {
+            return h("div", [
+              h(
+                "Button",
                {
                  props: {
-                    color: params.row.forceUpdate ? "primary" : "default",
+                    type: "info",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.detail(params.row);
+                    },
                  },
                },
-                params.row.forceUpdate == 0 ? "非强制" : "强制"
-              );
+                "查看"
+              ),
+              h(
+                "Button",

-
-            }
-          },
-          {
-            title: "类型",
-            key: "type",
-            minWidth: 80,
-            render: (h, params) => {
-              if (params.row.type == "IOS") {
-                return h('div', [h('span', {}, '苹果'),]);
-              } else {
-                return h('div', [h('span', {}, '安卓'),]);
-              }
-            }
-          },
-
-          {
-            title: "更新时间",
-            key: "versionUpdateDate",
-            minWidth: 120,
-            sortable: true,
-          },
-
-          {
-            title: "操作",
-            key: "action",
-            align: "center",
-            width: 230,
-            render: (h, params) => {
-              return h("div", [
-                h(
-                  "Button",
-                  {
-                    props: {
-                      type: "info",
-                      size: "small",
-                    },
-                    style: {
-                      marginRight: "5px",
-                    },
-                    on: {
-                      click: () => {
-                        this.detail(params.row);
-                      },
+                {
+                  props: {
+                    type: "info",
+                    size: "small",
+                    ghost: true,
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.editAppVersion(params.row);
                    },
                  },
-                  "查看"
-                ),
-                h(
-                  "Button",
-
-                  {
-                    props: {
-                      type: "info",
-                      size: "small",
-                      ghost:true
-                    },
-                    style: {
-                      marginRight: "5px",
-                    },
-                    on: {
-                      click: () => {
-                        this.editAppVersion(params.row);
-                      },
+                },
+                "修改"
+              ),
+              h(
+                "Button",
+                {
+                  props: {
+                    type: "error",
+                    size: "small",
+                  },
+                  style: {
+                    marginRight: "5px",
+                  },
+                  on: {
+                    click: () => {
+                      this.remove(params.row);
                    },
                  },
-                  "修改"
-                ),
-                h(
-                  "Button",
-                  {
-                    props: {
-                      type: "error",
-                      size: "small",
-                    },
-                    style: {
-                      marginRight: "5px",
-                    },
-                    on: {
-                      click: () => {
-                        this.remove(params.row);
-                      },
-                    },
-                  },
-                  "删除"
-                ),
-              ]);
-            },
+                },
+                "删除"
+              ),
+            ]);
          },
-        ],
-        data: [], // 表单数据
-        total: 0, // 表单数据总数
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+    };
+  },
+  methods: {
+    init() {
+      this.getData();
+    },
+    changePage(v) {
+      this.searchForm.pageNumber = v;
+      this.getData();
+    },
+    changePageSize(v) {
+      this.searchForm.pageSize = v;
+      this.getData();
+    },
+    handleSearch() {
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getData();
+    },
+    changeSort(e) {
+      this.searchForm.sort = e.key;
+      this.searchForm.order = e.order;
+      if (e.order === "normal") {
+        this.searchForm.order = "";
+      }
+      this.getData();
+    },
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
+    getData() {
+      this.loading = true;
+      API_Setting.appVersionPage(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+    //添加app版本信息
+    addAppVersion() {
+      this.modalVisible = true;
+      this.modalTitle = "添加APP版本信息";
+      const versionUpdateDate = this.$options.filters.unixToDate(
+        new Date() / 1000
+      );
+      this.form = {
+        forceUpdate: 0,
+        type: "IOS",
+        versionUpdateDate: versionUpdateDate,
+        content: " ",
      };
    },
-    methods: {
-      init() {
-        this.getData();
-      },
-      changePage(v) {
-        this.searchForm.pageNumber = v;
-        this.getData();
-      },
-      changePageSize(v) {
-        this.searchForm.pageSize = v;
-        this.getData();
-      },
-      handleSearch() {
-        this.searchForm.pageNumber = 1;
-        this.searchForm.pageSize = 10;
-        this.getData();
-      },
-      changeSort(e) {
-        this.searchForm.sort = e.key;
-        this.searchForm.order = e.order;
-        if (e.order === "normal") {
-          this.searchForm.order = "";
-        }
-        this.getData();
-      },
-      changeSelect(e) {
-        this.selectList = e;
-        this.selectCount = e.length;
-      },
-      getData() {
-        this.loading = true;
-        API_Setting.appVersionPage(this.searchForm).then((res) => {
-          this.loading = false;
-          if (res.success) {
-            this.data = res.result.records;
-            this.total = res.result.total;
-          }
-        });
-        this.total = this.data.length;
-        this.loading = false;
-      },
-      //添加app版本信息
-      addAppVersion() {
-        this.modalVisible = true;
-        this.modalTitle = "添加APP版本信息"
-        const versionUpdateDate = this.$options.filters.unixToDate(
-          new Date() / 1000
-        );
-        this.form = {
-          forceUpdate: 0,
-          type: "IOS",
-          versionUpdateDate: versionUpdateDate,
-          content: " "
-        }
-      },
-      //添加app版本信息
-      editAppVersion(v) {
-        this.modalVisible = true;
-        this.modalTitle = "修改APP版本信息"
-        this.modalType = 1
-        this.form = v
-      },
-      //保存app版本信息
-      saveAppVersion() {
-        this.$refs.form.validate((valid) => {
-          if (valid) {
-            this.submitLoading = true;
-            const versionUpdateDate = this.$options.filters.unixToDate(
-              this.form.versionUpdateDate / 1000
-            );
-            this.form.versionUpdateDate = versionUpdateDate
-            this.form.updateTime = versionUpdateDate
-            if (this.modalType == 0) {
-              // 添加 避免编辑后传入id等数据 记得删除
-              delete this.form.id;
-              API_Setting.addVersion(this.form).then((res) => {
-                this.submitLoading = false;
-                if (res && res.success) {
-                  this.$Message.success("添加成功");
-                  this.modalVisible = false
-                  this.getData();
-                }
-              });
-            } else {
-              API_Setting.editVersion(this.form, this.form.id).then((res) => {
-                this.submitLoading = false;
-                if (res && res.success) {
-                  this.$Message.success("修改成功");
-                  this.modalVisible = false
-                  this.getData();
-                }
-              });
-            }
-
-          }
-        })
-      },
-      remove(v) {
-        this.$Modal.confirm({
-          title: "确认删除",
-          content: "您确认要删除么?",
-          loading: true,
-          onOk: () => {
-            // 删除
-            API_Setting.deleteVersion(v.id).then(res => {
-              this.$Modal.remove();
-              if (res.success) {
-                this.$Message.success("删除成功");
+    //添加app版本信息
+    editAppVersion(v) {
+      this.modalVisible = true;
+      this.modalTitle = "修改APP版本信息";
+      this.modalType = 1;
+      this.form = v;
+    },
+    //保存app版本信息
+    saveAppVersion() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+          const versionUpdateDate = this.$options.filters.unixToDate(
+            this.form.versionUpdateDate / 1000
+          );
+          this.form.versionUpdateDate = versionUpdateDate;
+          this.form.updateTime = versionUpdateDate;
+          if (this.modalType == 0) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete this.form.id;
+            API_Setting.addVersion(this.form).then((res) => {
+              this.submitLoading = false;
+              if (res && res.success) {
+                this.$Message.success("添加成功");
+                this.modalVisible = false;
+                this.getData();
+              }
+            });
+          } else {
+            API_Setting.editVersion(this.form, this.form.id).then((res) => {
+              this.submitLoading = false;
+              if (res && res.success) {
+                this.$Message.success("修改成功");
+                this.modalVisible = false;
                this.getData();
              }
            });
          }
-        });
-      },
-      detail(v) {
-        this.queryModalVisible = true
-        this.form = JSON.parse(JSON.stringify(v))
-        //时间格式化有问题，所以另外单独给时间赋值
-        this.versionUpdateDate = this.form.versionUpdateDate
-      },
+        }
+      });
    },
-    mounted() {
-      this.init();
+    remove(v) {
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除么?",
+        loading: true,
+        onOk: () => {
+          // 删除
+          API_Setting.deleteVersion(v.id).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("删除成功");
+              this.getData();
+            }
+          });
+        },
+      });
    },
-  };
+    detail(v) {
+      this.queryModalVisible = true;
+      this.form = JSON.parse(JSON.stringify(v));
+      //时间格式化有问题，所以另外单独给时间赋值
+      this.versionUpdateDate = this.form.versionUpdateDate;
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
 </script>
 <style lang="scss" scoped>
-  .ivu-form-item {
-    margin-bottom: 14px;
-    vertical-align: top;
-    zoom: 1;
-  }
-.search-form{
+.ivu-form-item {
+  margin-bottom: 14px;
+  vertical-align: top;
+  zoom: 1;
+}
+.search-form {
  width: 100%;
 }
-  // 建议引入通用样式 可删除下面样式代码
-  @import "@/styles/table-common.scss";
+// 建议引入通用样式 可删除下面样式代码
+@import "@/styles/table-common.scss";
 </style>
--- a/manager/src/views/sys/message/sms.vue
+++ b/manager/src/views/sys/message/sms.vue
@@ -710,7 +710,7 @@ export default {
    //发送短信
    sendSms() {
      this.$refs.smsForm.validate((valid) => {
-        const mobile = JSON.stringify(this.alreadyCheck);
+        const mobile = this.alreadyCheck;
        this.smsForm.mobile = mobile;
        if (valid) {
          API_Setting.sendSms(this.smsForm).then((res) => {
--- a/manager/src/views/sys/message/smsSign.vue
+++ b/manager/src/views/sys/message/smsSign.vue
@@ -162,8 +162,12 @@

  };
 </script>
-<style lang="scss">
-  .sign-name {
+
+<style lang="scss" scoped>
+  // 建议引入通用样式 可删除下面样式代码
+  @import "@/styles/table-common.scss";
+
+   .sign-name {
    margin-top: 5px;
    margin-left: 20px;
    font-size: 16px;
@@ -189,7 +193,3 @@
    margin-left: 100px;
  }
 </style>
-<style lang="scss">
-  // 建议引入通用样式 可删除下面样式代码
-  @import "@/styles/table-common.scss";
-</style>