更新前端文件

crmeb/public/admin/css/chunk-6ebc5958.61e71427.css

@@ -0,0 +1 @@
+.ivu-form-label-left[data-v-53a94b0a] .ivu-form-item-label{text-align:right}.tabform .export[data-v-53a94b0a]{margin-left:10px}.red[data-v-53a94b0a]{color:#ff5722}.green[data-v-53a94b0a]{color:#009688}.ivu-mt[data-v-53a94b0a] .ivu-select-placeholder{height:32px}

crmeb/public/admin/css/chunk-ac03c1a4.2b511d27.css

@@ -1 +0,0 @@
-.ivu-form-label-left[data-v-47d8dcee] .ivu-form-item-label{text-align:right}.tabform .export[data-v-47d8dcee]{margin-left:10px}.red[data-v-47d8dcee]{color:#ff5722}.green[data-v-47d8dcee]{color:#009688}.ivu-mt[data-v-47d8dcee] .ivu-select-placeholder{height:32px}

template/admin/.gitignore

@@ -0,0 +1,29 @@
+.DS_Store
+node_modules
+/dist
+.history
+package-lock.json
+
+/tests/e2e/videos/
+/tests/e2e/screenshots/
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw*
+
+build/env.js
+.env

template/admin/src/components/uploadPictures/index.vue

@@ -48,7 +48,7 @@
                 :data="uploadData"
                 :headers="header"
                 :multiple="true"
-                :format="['jpg', 'jpeg', 'png']"
+                :format="['jpg', 'jpeg', 'png', 'gif']"
                 :on-success="handleSuccess"
                 style="margin-top: 1px; display: inline-block"
               >

template/admin/src/pages/finance/financialRecords/bill/index.vue

@@ -16,7 +16,7 @@
       >
         <Row :gutter="24" type="flex">
           <Col :xl="6" :lg="12" :md="13" :sm="12" :xs="24">
-            <FormItem label="昵称/ID：">
+            <FormItem label="关键字：">
               <Input
                 enter-button
                 placeholder="请输入"

template/admin/src/pages/order/orderList/components/tableList.vue

@@ -110,14 +110,16 @@
         <Divider
           type="vertical"
           v-if="
-            row._status === 1 ||
-            row._status === 3 ||
-            (row._status === 2 && !row.pinkStatus) ||
-            row._status === 4 ||
-            (row.shipping_type == 2 &&
-              row.status == 0 &&
-              row.paid == 1 &&
-              row.refund_status === 0)
+            row.refund_type !== 4 &&
+            row.refund_type !== 5 &&
+            (row._status === 1 ||
+              row._status === 3 ||
+              (row._status === 2 && !row.pinkStatus) ||
+              row._status === 4 ||
+              (row.shipping_type == 2 &&
+                row.status == 0 &&
+                row.paid == 1 &&
+                row.refund_status === 0))
           "
         />
         <template>

template/admin/src/pages/order/orderList/handle/orderSend.vue

@@ -244,7 +244,6 @@ export default {
           title: "商品信息",
           slot: "image",
           width: 200,
-          align: "center",
         },
         {
           title: "规格",

template/admin/src/pages/order/orderList/splitList.vue

@@ -1,10 +1,10 @@
 <template>
   <div>
-  <div class="i-layout-page-header">
-          <div class="i-layout-page-header">
-            <span class="ivu-page-header-title">子订单列表</span>
-          </div>
-        </div>
+    <div class="i-layout-page-header">
+      <div class="i-layout-page-header">
+        <span class="ivu-page-header-title">子订单列表</span>
+      </div>
+    </div>
     <Table
       :columns="columns"
       :data="orderList"
@@ -52,22 +52,22 @@
           }}</span>
         </div>
       </template>
-	  <template slot-scope="{ row, index }" slot="statusName">
-	    <div v-html="row.status_name.status_name" class="pt5"></div>
-	    <div class="pictrue-box">
-	      <div
-	        v-viewer
-	        v-if="row.status_name.pics"
-	        v-for="(item, index) in row.status_name.pics || []"
-	        :key="index"
-	      >
-	        <img class="pictrue mr10" v-lazy="item" :src="item" />
-	      </div>
-	    </div>
-	  </template>
+      <template slot-scope="{ row, index }" slot="statusName">
+        <div v-html="row.status_name.status_name" class="pt5"></div>
+        <div class="pictrue-box">
+          <div
+            v-viewer
+            v-if="row.status_name.pics"
+            v-for="(item, index) in row.status_name.pics || []"
+            :key="index"
+          >
+            <img class="pictrue mr10" v-lazy="item" :src="item" />
+          </div>
+        </div>
+      </template>
       <template slot-scope="{ row, index }" slot="action">
         <a @click="edit(row)" v-if="row._status === 1">编辑</a>
-        <!-- <a
+        <a
           @click="sendOrder(row)"
           v-if="
             (row._status === 2 || row._status === 8) &&
@@ -75,7 +75,7 @@
             (row.pinkStatus === null || row.pinkStatus === 2)
           "
           >发送货</a
-        > -->
+        >
         <a @click="delivery(row)" v-if="row._status === 4">配送信息</a>
         <a
           @click="bindWrite(row)"
@@ -171,8 +171,9 @@
               <DropdownItem name="8" v-show="row._status === 4"
                 >已收货</DropdownItem
               >
-			  <DropdownItem name="9" v-if="row.is_del == 1"
-			    >删除订单</DropdownItem>
+              <DropdownItem name="9" v-if="row.is_del == 1"
+                >删除订单</DropdownItem
+              >
             </DropdownMenu>
           </Dropdown>
         </template>
@@ -673,8 +674,7 @@ export default {
       this.getList();
     },
     getOrderList(id) {
-      splitOrderList(id).then((res) => {
-      });
+      splitOrderList(id).then((res) => {});
     },
     // 订单列表
     getList(res) {

template/admin/src/pages/product/productAdd/index.vue

@@ -441,6 +441,7 @@
                       <InputNumber
                         v-model="oneFormBatch[0].price"
                         :min="0"
+                        :max="99999999"
                         class="priceBox"
                       ></InputNumber>
                     </template>
@@ -448,6 +449,7 @@
                       <InputNumber
                         v-model="oneFormBatch[0].cost"
                         :min="0"
+                        :max="99999999"
                         class="priceBox"
                       ></InputNumber>
                     </template>
@@ -466,6 +468,7 @@
                           formValidate.virtual_type == 1
                         "
                         :min="0"
+                        :max="99999999"
                         class="priceBox"
                       ></InputNumber>
                     </template>
@@ -509,6 +512,7 @@
                         v-model="oneFormBatch[0].weight"
                         :step="0.1"
                         :min="0"
+                        :max="99999999"
                         class="priceBox"
                       ></InputNumber>
                     </template>
@@ -517,6 +521,7 @@
                         v-model="oneFormBatch[0].volume"
                         :step="0.1"
                         :min="0"
+                        :max="99999999"
                         class="priceBox"
                       ></InputNumber>
                     </template>
@@ -563,6 +568,7 @@
                       <InputNumber
                         v-model="manyFormValidate[index].price"
                         :min="0"
+                        :max="99999999"
                         class="priceBox"
                       ></InputNumber>
                     </template>
@@ -570,6 +576,7 @@
                       <InputNumber
                         v-model="manyFormValidate[index].cost"
                         :min="0"
+                        :max="99999999"
                         class="priceBox"
                       ></InputNumber>
                     </template>
@@ -577,6 +584,7 @@
                       <InputNumber
                         v-model="manyFormValidate[index].ot_price"
                         :min="0"
+                        :max="99999999"
                         class="priceBox"
                       ></InputNumber>
                     </template>
@@ -588,6 +596,7 @@
                           formValidate.virtual_type == 1
                         "
                         :min="0"
+                        :max="99999999"
                         :precision="0"
                         class="priceBox"
                       ></InputNumber>
@@ -599,6 +608,7 @@
                       <InputNumber
                         v-model="manyFormValidate[index].weight"
                         :min="0"
+                        :max="99999999"
                         class="priceBox"
                       ></InputNumber>
                     </template>
@@ -606,6 +616,7 @@
                       <InputNumber
                         v-model="manyFormValidate[index].volume"
                         :min="0"
+                        :max="99999999"
                         class="priceBox"
                       ></InputNumber>
                     </template>
@@ -688,6 +699,7 @@
                   <InputNumber
                     v-model="oneFormValidate[0].price"
                     :min="0"
+                    :max="99999999"
                     class="priceBox"
                   ></InputNumber>
                 </template>
@@ -695,6 +707,7 @@
                   <InputNumber
                     v-model="oneFormValidate[0].cost"
                     :min="0"
+                    :max="99999999"
                     class="priceBox"
                   ></InputNumber>
                 </template>
@@ -702,6 +715,7 @@
                   <InputNumber
                     v-model="oneFormValidate[0].ot_price"
                     :min="0"
+                    :max="99999999"
                     class="priceBox"
                   ></InputNumber>
                 </template>
@@ -709,6 +723,7 @@
                   <InputNumber
                     v-model="oneFormValidate[0].stock"
                     :min="0"
+                    :max="99999999"
                     :disabled="
                       formValidate.is_virtual == 1 &&
                       formValidate.virtual_type == 1
@@ -724,6 +739,7 @@
                   <InputNumber
                     v-model="oneFormValidate[0].weight"
                     :min="0"
+                    :max="99999999"
                     class="priceBox"
                   ></InputNumber>
                 </template>
@@ -759,6 +775,7 @@
                   <InputNumber
                     v-model="oneFormValidate[0].volume"
                     :min="0"
+                    :max="99999999"
                     class="priceBox"
                   ></InputNumber>
                 </template>
@@ -829,6 +846,7 @@
             <FormItem label="虚拟销量：">
               <InputNumber
                 :min="0"
+                :max="999999"
                 v-model="formValidate.ficti"
                 placeholder="请输入虚拟销量"
               />
@@ -839,6 +857,7 @@
               <InputNumber
                 v-model="formValidate.give_integral"
                 :min="0"
+                :max="999999"
                 placeholder="请输入积分"
               />
             </FormItem>
@@ -847,6 +866,7 @@
             <FormItem label="排序：">
               <InputNumber
                 :min="0"
+                :max="999999"
                 v-model="formValidate.sort"
                 placeholder="请输入排序"
               />
@@ -929,6 +949,7 @@
                   <InputNumber
                     v-model="oneFormValidate[0].brokerage"
                     :min="0"
+                    :max="999999"
                     class="priceBox"
                   ></InputNumber>
                 </template>
@@ -936,6 +957,7 @@
                   <InputNumber
                     v-model="oneFormValidate[0].brokerage_two"
                     :min="0"
+                    :max="999999"
                     class="priceBox"
                   ></InputNumber>
                 </template>
@@ -943,6 +965,7 @@
                   <InputNumber
                     v-model="oneFormValidate[0].vip_price"
                     :min="0"
+                    :max="999999"
                     class="priceBox"
                   ></InputNumber>
                 </template>
@@ -965,12 +988,14 @@
                 一级返佣：<InputNumber
                   placeholder="请输入一级返佣"
                   :min="0"
+                  :max="9999999"
                   class="columnsBox perW20"
                   v-model="manyBrokerage"
                 ></InputNumber>
                 二级返佣：<InputNumber
                   placeholder="请输入二级返佣"
                   :min="0"
+                  :max="99999999"
                   class="columnsBox perW20"
                   v-model="manyBrokerageTwo"
                 ></InputNumber>
@@ -979,6 +1004,7 @@
                 会员价：<InputNumber
                   placeholder="请输入会员价"
                   :min="0"
+                  :max="99999999"
                   class="columnsBox perW20"
                   v-model="manyVipPrice"
                 ></InputNumber>
@@ -1062,6 +1088,7 @@
                   <InputNumber
                     v-model="manyFormValidate[index].brokerage"
                     :min="0"
+                    :max="99999999"
                     class="priceBox"
                   ></InputNumber>
                 </template>
@@ -1069,6 +1096,7 @@
                   <InputNumber
                     v-model="manyFormValidate[index].brokerage_two"
                     :min="0"
+                    :max="99999999"
                     class="priceBox"
                   ></InputNumber>
                 </template>
@@ -1076,6 +1104,7 @@
                   <InputNumber
                     v-model="manyFormValidate[index].vip_price"
                     :min="0"
+                    :max="99999999"
                     class="priceBox"
                   ></InputNumber>
                 </template>

template/admin/src/pages/product/productList/components/goodsDetail.vue

@@ -0,0 +1,130 @@
+<template>
+    <div class="goods_detail">
+        <div class="goods_detail_wrapper" style="height: 640px;">
+            <HappyScroll size="5" resize hide-horizontal>
+                <div style="width: 375px">
+                    <div class="title-box">商品详情</div>
+                    <div class="swiper-box">
+                        <Carousel autoplay v-model="value2" loop arrow="never">
+                            <CarouselItem v-for="(item,index) in goodsInfo.productInfo.slider_image" :key="index">
+                                <div class="demo-carousel"><img :src="item" alt=""></div>
+                            </CarouselItem>
+                        </Carousel>
+                    </div>
+                    <div class="goods_info">
+                        <div class="number-wrapper">
+                            <div class="price"><span>¥</span>{{goodsInfo.productInfo.price}}</div>
+                            <div class="old-price">¥{{goodsInfo.productInfo.vip_price}}</div>
+                            <div><img src="../../../../assets/images/goods_vip.png"></div>
+                        </div>
+                        <div class="name">{{goodsInfo.productInfo.store_name}}</div>
+                        <div class="msg">
+                            <div class="item">原价:￥{{goodsInfo.productInfo.ot_price}}</div>
+                            <div class="item">销量:{{goodsInfo.productInfo.sales}}</div>
+                            <div class="item">库存:{{goodsInfo.productInfo.stock}}</div>
+                        </div>
+                    </div>
+                    <div class="con-box">
+                        <div class="title-box">商品介绍</div>
+                        <div class="content" v-html="goodsInfo.productInfo.description"></div>
+                    </div>
+                </div>
+            </HappyScroll>
+
+        </div>
+    </div>
+</template>
+
+<script>
+    import { HappyScroll } from 'vue-happy-scroll'
+    import { productInfoApi } from '@/api/product'
+    export default {
+        name: "goods_detail",
+        props:{
+            goodsId:{
+                type:String | Number,
+                default:''
+            }
+        },
+        components:{
+            HappyScroll
+        },
+        data(){
+            return {
+                value2: 0,
+                goodsInfo:{}
+            }
+        },
+        mounted() {
+            this.getInfo()
+        },
+        methods:{
+            getInfo(){
+                productInfoApi(this.goodsId).then(res=>{
+                    this.goodsInfo = res.data
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="stylus" scoped>
+.goods_detail
+    .goods_detail_wrapper{
+        z-index 20
+        position fixed
+        left 50%
+        top 50%
+        transform translate(-50%,-50%)
+        width 375px
+        background #F0F2F5
+    }
+    .title-box{
+        height:46px
+        line-height 46px
+        background #fff
+        text-align center
+        color #333
+        font-size 16px
+    }
+    .swiper-box
+        height 375px
+        .demo-carousel
+            width 375px
+            height 375px
+            img
+                width 100%
+                height 100%
+                display block
+    .goods_info
+        padding 15px
+        background #fff
+        .number-wrapper
+            display flex
+            align-items center
+            .price
+                color #FF3838
+                font-size 25px
+                span
+                    font-size 15px
+            .old-price
+                font-size 15px
+                margin-left 10px
+                color #333333
+        .name
+            font-size 16px
+            color #333
+        .msg
+            display flex
+            align-items center
+            justify-content space-between
+            margin-top 10px
+            .item
+                color #999999
+                font-size 14px
+    .con-box
+        margin-top 10px
+        padding-bottom 20px
+        background: #f0f2f5;
+
+</style>

template/admin/src/pages/product/productList/index.vue

@@ -129,6 +129,8 @@
           </i-switch>
         </template>
         <template slot-scope="{ row, index }" slot="action">
+          <a @click="look(row)">查看</a>
+          <Divider type="vertical" />
           <a @click="edit(row)">编辑</a>
           <Divider type="vertical" />
           <router-link :to="{ path: '/admin/product/product_reply/' + row.id }"
@@ -170,6 +172,11 @@
     >
       <tao-bao ref="taobaos" v-if="modals" @on-close="onClose"></tao-bao>
     </Modal>
+    <!-- 商品弹窗 -->
+    <div v-if="isProductBox">
+      <div class="bg" @click="isProductBox = false"></div>
+      <goodsDetail :goodsId="goodsId"></goodsDetail>
+    </div>
   </div>
 </template>
 
@@ -179,6 +186,8 @@ import attribute from "./attribute";
 import toExcel from "../../../utils/Excel.js";
 import { mapState } from "vuex";
 import taoBao from "./taoBao";
+import goodsDetail from "./components/goodsDetail.vue";
+
 import {
   getGoodHeade,
   getGoods,
@@ -190,7 +199,7 @@ import {
 } from "@/api/product";
 export default {
   name: "product_productList",
-  components: { expandRow, attribute, taoBao },
+  components: { expandRow, attribute, taoBao, goodsDetail },
   computed: {
     ...mapState("userLevel", ["categoryId"]),
   },
@@ -301,6 +310,8 @@ export default {
       attrTemplate: false,
       selectedIds: new Set(), //选中合并项的id
       ids: [],
+      goodsId: "",
+      isProductBox: false,
     };
   },
   watch: {
@@ -321,6 +332,11 @@ export default {
     }
   },
   methods: {
+    look(row) {
+      console.log(row);
+      this.goodsId = row.id;
+      this.isProductBox = true;
+    },
     getPath() {
       this.columns2 = [...this.columns];
       if (name !== "1" && name !== "2") {
@@ -607,6 +623,7 @@ export default {
         url: `product/product/${row.id}`,
         method: "DELETE",
         ids: "",
+        un: 1,
       };
       this.$modalSure(delfromData)
         .then((res) => {
@@ -653,4 +670,42 @@ export default {
     height: 100%;
   }
 }
+
+.bg {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 11;
+}
+
+/deep/.happy-scroll-content {
+  width: 100%;
+
+  .demo-spin-icon-load {
+    animation: ani-demo-spin 1s linear infinite;
+  }
+
+  @keyframes ani-demo-spin {
+    from {
+      transform: rotate(0deg);
+    }
+
+    50% {
+      transform: rotate(180deg);
+    }
+
+    to {
+      transform: rotate(360deg);
+    }
+  }
+
+  .demo-spin-col {
+    height: 100px;
+    position: relative;
+    border: 1px solid #eee;
+  }
+}
 </style>

template/admin/src/pages/setting/systemMenus/components/menusFrom.vue

@@ -2,7 +2,7 @@
   <div>
     <Modal
       v-model="modals"
-      width="850"
+      width="700"
       scrollable
       footer-hide
       closable
@@ -40,11 +40,14 @@
         </Row>
         <Row type="flex" :gutter="24">
           <Col v-bind="grid">
-            <FormItem label="按钮名称：" prop="menu_name">
+            <FormItem
+              :label="!authType ? '接口名称：' : '按钮名称：'"
+              prop="menu_name"
+            >
               <div class="add">
                 <Input
                   v-model="formValidate.menu_name"
-                  placeholder="请输入按钮名称"
+                  :placeholder="!authType ? '请输入接口名称' : '请输入按钮名称'"
                 >
                 </Input>
                 <Button
@@ -87,23 +90,23 @@
               ></Input>
             </FormItem>
           </Col>
-          <Col v-bind="grid" v-if="authType">
+          <!-- <Col v-bind="grid" v-if="authType">
             <FormItem label="接口参数：">
               <Input
                 v-model="formValidate.params"
                 placeholder="举例:a/123/b/234"
               ></Input>
             </FormItem>
-          </Col>
+          </Col> -->
           <Col v-bind="grid" v-if="authType">
-            <FormItem label="路由名称：" prop="menu_path">
+            <FormItem label="路由地址：" prop="menu_path">
               <Input
                 v-model="formValidate.menu_path"
-                placeholder="请输入路由名称"
+                placeholder="请输入路由地址"
               ></Input>
             </FormItem>
           </Col>
-          <Col v-bind="grid">
+          <Col v-bind="grid" v-if="authType">
             <FormItem label="权限标识：" prop="unique_auth">
               <Input
                 v-model="formValidate.unique_auth"
@@ -130,6 +133,7 @@
           <!--</Select>-->
           <!--</FormItem>-->
           <!--</Col>-->
+
           <Col v-bind="grid">
             <FormItem label="排序：">
               <Input
@@ -140,12 +144,12 @@
               ></Input>
             </FormItem>
           </Col>
-          <Col v-bind="grid">
-            <FormItem label="状态：">
-              <RadioGroup v-model="formValidate.is_show">
+          <Col v-bind="grid" v-if="authType">
+            <FormItem label="隐藏菜单：">
+              <RadioGroup v-model="formValidate.is_show_path">
                 <Radio
                   :label="item.value"
-                  v-for="(item, i) in isShowRadio"
+                  v-for="(item, i) in isShowPathRadio"
                   :key="i"
                 >
                   <Icon type="social-apple"></Icon>
@@ -154,12 +158,12 @@
               </RadioGroup>
             </FormItem>
           </Col>
-          <Col v-bind="grid">
-            <FormItem label="是否为隐藏菜单：">
-              <RadioGroup v-model="formValidate.is_show_path">
+          <Col :xs="24">
+            <FormItem label="状态：">
+              <RadioGroup v-model="formValidate.is_show">
                 <Radio
                   :label="item.value"
-                  v-for="(item, i) in isShowPathRadio"
+                  v-for="(item, i) in isShowRadio"
                   :key="i"
                 >
                   <Icon type="social-apple"></Icon>
@@ -168,6 +172,7 @@
               </RadioGroup>
             </FormItem>
           </Col>
+
           <Col span="24">
             <Button
               type="primary"
@@ -245,7 +250,7 @@
           :key="index"
           @click="selectRule(item)"
         >
-          <div>按钮名称：{{ item.real_name }}</div>
+          <div>接口名称：{{ item.real_name }}</div>
           <div>请求方式：{{ item.method }}</div>
           <div>接口地址：{{ item.rule }}</div>
         </div>
@@ -288,7 +293,7 @@ export default {
           { required: true, message: "请输入按钮名称", trigger: "blur" },
         ],
         menu_path: [
-          { required: true, message: "请输入路由名称", trigger: "blur" },
+          { required: true, message: "请输入路由地址", trigger: "blur" },
         ],
         methods: [
           { required: true, message: "请选择接口请求方式", trigger: "blur" },
@@ -308,16 +313,16 @@ export default {
     };
   },
   watch: {
-    "formValidate.header": function(n) {
+    "formValidate.header": function (n) {
       this.formValidate.is_header = n ? 1 : 0;
     },
-    "formValidate.auth_type": function(n) {
+    "formValidate.auth_type": function (n) {
       if (n === undefined) {
         n = 1;
       }
       this.authType = n === 1;
     },
-    "formValidate.data": function(n) {},
+    "formValidate.data": function (n) {},
   },
   computed: {
     /* eslint-disable */
@@ -558,6 +563,9 @@ export default {
   position: relative;
   padding-top: 10px;
 }
+.icons-item .ivu-icon {
+  font-size: 16px;
+}
 .search-rule {
   display: flex;
   align-items: center;

template/admin/src/pages/system/auth/index.vue

@@ -18,21 +18,16 @@
                         <!--<div>体验时间剩余 {{dayNum}}天</div>-->
                         <!--<div class="code red">审核未通过</div>-->
                     <!--</div>-->
-                    <div class="text" v-if="status === 1">
+                    <div class="text">
                         <div>商业授权</div>
-                        <div class="code">授权码：{{ authCode }}</div>
-                    </div>
-                    <div class="text" v-else>
-                        <div>商业授权</div>
-                        <div class="code">授权码：未授权</div>
+                        <div class="code">开源版</div>
                     </div>
                     <!--<div class="text" v-else-if="status === 0">-->
                         <!--<div>体验时间剩余 {{dayNum}}天</div>-->
                         <!--<div class="code blue">授权申请已提交，请等待审核</div>-->
                     <!--</div>-->
                 </div>
-                <Button @click="toCrmeb()" v-if="status === 1">进入官网</Button>
-                <Button type="primary" @click="isTemplate = true" v-else>申请授权</Button>
+                <Button @click="toCrmeb()">进入官网</Button>
                 <!--<Button type="primary" @click="isTemplate = true" v-else-if="status === -1 || status === -9">申请授权</Button>-->
                 <!--<Button type="primary" @click="isTemplate = true" v-else-if="status === 2">重新申请</Button>-->
                 <!--<Button class="grey" v-else-if="status === 0">审核中</Button>-->

template/admin/src/router/routers.js

@@ -30,7 +30,7 @@ const frameIn = [
     {
         path: '/admin/',
         meta: {
-            title: 'CRMEB'
+            title: '后台管理'
         },
         redirect: {
             name: 'home_index'

template/admin/src/styles/style.css

@@ -576,6 +576,7 @@ html, body {
 .content img{
     display: block;
     max-width: 100%;
+    object-fit: contain;
 }
 .none-radius .ivu-modal-content{border-radius: 0;}
 .transfer-mask .ivu-modal-wrap{

template/admin/src/utils/public.js

@@ -14,6 +14,8 @@ export function modalSure (delfromData) {
         let content = ''
         if (delfromData.info !== undefined) {
             content = `<p>${delfromData.title}</p><p>${delfromData.info}</p>`
+        } else if(delfromData.un !== undefined) {
+            content = `<p>确定要${delfromData.title}吗？</p>`
         } else {
             content = `<p>确定要${delfromData.title}吗？</p><p>${delfromData.title}后将无法恢复，请谨慎操作！</p>`
         }