up

src/components/XyTinymce/EditorImage.vue

@@ -76,6 +76,7 @@ export default {
       this.$emit('updateshow',this.dialogVisible)
     },
     handleSuccess(response, file) {
+      console.log("response",response)
       const uid = file.uid
       const objKeyArr = Object.keys(this.listObj)
       for (let i = 0, len = objKeyArr.length; i < len; i++) {

src/components/XyTinymce/index.vue

@@ -83,7 +83,7 @@ export default {
           //定义一个名为 assignment 的toolbar
           editor.ui.registry.addButton('assignment', {
             text: `<i class="el-icon-position" style="font-size: 16px">上传</i>`,
-            tooltip: '图片上传',
+            // tooltip: '图片上传',
             onAction: () => {
               this.showImg = true
               // _this.showEdit = true

src/layout/components/Navbar.vue

@@ -15,8 +15,13 @@
         :hide-on-click="false"
       >
         <div class="message-wrapper">
+
+
+          <el-badge :value="noticeData.length>0?noticeData.length:''" :max="99" class="item">
             <i class="el-icon-chat-dot-square" />
             <span>消息中心</span>
+          </el-badge>
+
         </div>
         <template v-slot:dropdown>
           <el-dropdown-menu class="message-dropdown">
@@ -46,7 +51,7 @@
                 <el-dropdown-item :divided="!index">
                   <div style="display: flex; align-items: center">
                     <div v-for="(value, key) in item.data">
-                      {{ key }} : {{ value }}
+                     {{timeymd(item.created_at)}} {{ key }} : {{ value }}
                     </div>
                     <Button
                       style="margin-left: 10px;"
@@ -59,6 +64,7 @@
                   </div>
                 </el-dropdown-item>
               </template>
+              <!-- <li>查看更多消息</li> -->
             </template>
             <template v-else>
               <div style="text-align: center;color: rgb(140,140,140);padding: 10px 0;">暂无通知</div>
@@ -177,6 +183,10 @@ export default {
     ...mapGetters(["sidebar", "avatar"]),
   },
   methods: {
+    timeymd(start){
+
+      return this.$moment(start).format('YYYY-MM-DD')
+    },
     toggleMessage(item){
       if(item.read_at) return
       toggleRead({
@@ -211,7 +221,11 @@ export default {
   },
 };
 </script>
-
+<style scoped>
+  /deep/ .el-badge__content.is-fixed{
+    top:13px;
+  }
+</style>
 <style lang="scss" scoped>
 .navbar {
   height: 50px;
@@ -296,10 +310,10 @@ export default {
         height: 100%;
 
         padding: 0 6px;
-        & > i {
+        i {
           font-weight: 600;
         }
-        & > span {
+        span {
           font-weight: 600;
 
           padding-left: 6px;

src/views/activity/component/addActivity.vue

@@ -314,6 +314,10 @@
 
 <!--    shopId选择-->
     <Modal v-model="isShowShops" title="关联方选择">
+      <div class="searchCompanys">
+        <el-input type="text" @keyup.enter.native="getCompanys" v-model="companykeyword" placeholder="请输入关键词查找商户"></el-input>
+        <el-button type="primary" @click="getCompanys">查询</el-button>
+      </div>
       <Table
         highlight-row
         ref="currentRowTable"
@@ -341,7 +345,7 @@ export default {
       type:'add',
       id:'',
       action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`,
-
+companykeyword:"",
       form:{
         activeName:"",
         company_ids:[],
@@ -510,7 +514,8 @@ export default {
     async getCompanys(){
       const res = await companyIndex({
         page_size:10,
-        page:this.companyPageIndex
+        page:this.companyPageIndex,
+        keyword:this.companykeyword
       })
       this.shops = res.rows
       this.shopTotal = res.total
@@ -718,4 +723,12 @@ export default {
 ::v-deep .el-input-number .el-input__inner{
   text-align: left !important;
 }
+  .searchCompanys{
+    display: flex;
+    justify-content: space-between;
+    margin-bottom:16px;
+    .el-input{
+      width:80%
+    }
+  }
 </style>

src/views/order/orderList.vue

@@ -37,7 +37,7 @@
                     <div class="select-content-item">
                       <div class="select-content-item-label">订单状态</div>
                       <div>
-                        <template v-for="(value,key) of orderItemStates">
+                        <template v-for="(value,key) of orderStates">
                           <!-- <el-tag size="small" v-if="key!='unpaid'" -->
                           <el-tag size="small"
                             :effect="select.orderStates.key === key ? 'dark' : 'plain'"
@@ -381,7 +381,7 @@
                   },
 
                   {
-                    prop: "state_name",
+                    prop: "order_state_name",
                     label: "状态",
                     width: 120
                   }

src/views/productService/components/addProduct.vue

@@ -195,7 +195,7 @@
 
     <Modal v-model="isShowMerchantSelect" title="所属商户选择">
       <div class="searchMerchants">
-        <el-input type="text" v-model="merchantKeyword" placeholder="请输入关键词查找商户"></el-input>
+        <el-input type="text" @keyup.enter.native="searchMerchants" v-model="merchantKeyword" placeholder="请输入关键词查找商户"></el-input>
         <el-button type="primary" @click="searchMerchants">查询</el-button>
       </div>
       <Table size="small" highlight-row ref="currentRowTable" :columns="merchantTable" :data="merchants"