askbot-dragon 1.6.78-beta → 1.6.78

package/src/components/message/TextMessage.vue

@@ -844,13 +844,15 @@ export default {
 
 <style lang="less">
 @import "../../assets/less/common.css";
+@import "../../assets/less/variables.less";
+
 #textMessage{
   min-width: 200px;
   .editMessage{
     display: flex;
     justify-content: space-between;
     margin-top: 10px;
-    border-top: 1px dashed #ebebeb;
+    border-top: 1px dashed @border-color-r6;
   }
   #submit{
     margin-top: 10px;
@@ -858,10 +860,10 @@ export default {
     align-items: center;
     justify-content: center;
     .el-button{
-      border: 1px solid #BBCDFF;
+      border: 1px solid  @border-color-search-ipt;
       border-radius: 14px;
       background-color: white;
-      color: #366aff;
+      color: @primary-color;
       font-weight: 400;
     }
     .el-button--small{
@@ -871,15 +873,15 @@ export default {
   }
   #html{
     p{
-      color:#A9B3C6;
+      color: @font-primary-color-r4;
     }
     .ask-component-placeholder-icon{
       padding-left: 12px;
-      color: #366aff;
+      color: @font-primary-accent-color;
       font-size: 18px;
     }
     .ask-component-placeholder-span{
-      color: #616161!important;
+      color: @font-secondary-color !important;
     }
   }
 }

package/src/components/message/swiper/ticketSwiper.vue

@@ -9,7 +9,7 @@
         >
           <slot></slot>
         </div>
-        <div v-if="device==='PC'&&content.multiple===true && content.cards && content.cards.length > 1" class="clickBtn">
+        <div v-if="device==='PC'&&content.multiple===true" class="clickBtn">
           <div class="preBtn" @click="preClick" style="display: flex">
             <i class="el-icon-arrow-left" style="font-size: 18px;font-weight:800;align-self: center;margin: auto"></i>
           </div>

package/src/components/myPopup.vue

@@ -1,18 +1,18 @@
 <template>
   <div class="container">
     <div class="top-container">
-      <div class="close">取消</div>
-      <div class="sure">确定</div>
+      <div class="close" @click="handleClose">{{ $t('dragonCommon.cancel') }}</div>
+      <div class="sure" @click="handleConfirm">{{ $t('dragonCommon.confirm') }}</div>
     </div>
-    <van-list v-model="loading" :finished="finished" finished-text="没有更多了" :offset="1" @load="onload" class="list-container">
+    <van-list
+      v-model="loading"
+      :finished="finished"
+      :finished-text="$t('dragonCommon.noMore')"
+      :offset="1"
+      @load="onLoad"
+      class="list-container"
+    >
       <van-cell v-for="item in list" :key="item.id" :title="item.name" />
-      <!-- <van-cell  title="123" />
-      <van-cell  title="asdasd" />
-      <van-cell  title="adszx" />
-      <van-cell  title="zxc zc" />
-      <van-cell  title="asdasd" />
-      <van-cell  title="wqeqweqwe" />
-      <van-cell  title="icvbncvbn" /> -->
     </van-list>
   </div>
 </template>
@@ -40,11 +40,16 @@ export default {
     onload() {
       this.$emit('onload')
     }
-  }
+  },
+  mounted() {
+    this.$i18n.locale = sessionStorage.getItem("systemLanguage") || 'cn';
+  },
 }
 </script>
 
 <style lang="less" scoped>
+@import "../assets/less/variables.less";
+
 .container {
   width: 100%;
   height: 100%;
@@ -57,10 +62,10 @@ export default {
     padding: 0 20px;
     box-sizing: border-box;
     .sure {
-      color: #366aff;
+      color: @font-primary-accent-color;
     }
     .close {
-      color: #cccccc;
+      color: @font-primary-color-r3;
     }
   }
   .list-container {

package/src/components/outputComponents/outputCom.vue

@@ -0,0 +1,149 @@
+<template>
+  <div class="outputComponents">
+    <div class="outputText" v-if="msg.content.prompt">
+      {{ msg.content.prompt }}
+    </div>
+    <el-table
+        :data="tableData"
+        style="width: 100%"
+        height="250"
+        @selection-change="handleSelectionChange"
+        v-if="msg.content.tableTemplate &&
+        (msg.content.tableTemplate == 1 || msg.content.tableTemplate == 2 || msg.content.tableTemplate == 3)"
+        :header-cell-style="{ backgroundColor: '#F6F8FD', height: '40px', color: '#000000', fontWeight: 400 }"
+        :row-style="{ height: '40px', color: '#000000' }"
+    >
+      <el-table-column
+          type="selection"
+          v-if="msg.content.tableTemplate == 2 || msg.content.tableTemplate == 3"
+          align="center"
+          :selectable="checkSelectable"
+          width="55">
+      </el-table-column>
+      <el-table-column
+          fixed
+          prop="name"
+          label="产品名称"
+          width="150">
+      </el-table-column>
+      <el-table-column
+          prop="number"
+          label="产品编号"
+          align="center"
+          width="120"
+      >
+      </el-table-column>
+      <el-table-column
+          prop="inventory"
+          label="产品库存"
+          align="center"
+          width="80">
+      </el-table-column>
+      <el-table-column
+          prop="consumption"
+          label="今日平均消耗量"
+          align="center"
+          width="120">
+      </el-table-column>
+    </el-table>
+    <div class="handleButton" v-if="msg.content.handleSettings && msg.content.handleSettings.length > 0" :class="disabled || isDisabled || selection.length === 0 ? 'disabledButton' : ''">
+      <div class="buttonText"
+           v-for="(item,index) in msg.content.handleSettings"
+           :key="index"
+           @click="confirmFun(item)"
+      >
+        {{ item }}
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "outputCom",
+  data(){
+    return{
+      isDisabled:false,
+      selection:[],
+      tableData:[
+        {
+          name:"正新香辣大鸡排",
+          number:"ZX78OIJ867",
+          inventory:"88",
+          consumption:"24"
+        },
+        {
+          name:"正新香辣大鸡排",
+          number:"ZX78OIJ867",
+          inventory:"88",
+          consumption:"24"
+        },{
+          name:"正新香辣大鸡排",
+          number:"ZX78OIJ867",
+          inventory:"88",
+          consumption:"24"
+        }
+        ,{
+          name:"正新香辣大鸡排",
+          number:"ZX78OIJ867",
+          inventory:"88",
+          consumption:"24"
+        }
+      ]
+    }
+  },
+  props:{
+    msg:{
+      type:Object,
+      default(){
+        return {}
+      }
+    },
+    disabled:{
+      type:Boolean,
+      default:false
+    }
+  },
+  methods:{
+    checkSelectable(){
+      return !this.disabled && !this.isDisabled
+    },
+    handleSelectionChange(val){
+      this.selection = val;
+    },
+    confirmFun(item){
+      if (this.disabled || this.isDisabled || this.selection.length == 0){
+        return
+      }
+      this.isDisabled = true;
+      this.$emit('confirmFun',item,this.selection,this.msg)
+    }
+  }
+};
+</script>
+
+<style scoped lang="less">
+.outputComponents{
+  .outputText{
+    padding-bottom: 10px;
+  }
+  .handleButton{
+    padding-top: 10px;
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-top: 1px solid #EEEEEE;
+    .buttonText{
+      padding: 0 4px;
+      cursor: pointer;
+      color: @font-primary-accent-color;
+    }
+  }
+  .disabledButton {
+    .buttonText {
+      color: @font-primary-color-r4 !important;
+    }
+  }
+}
+</style>

package/src/components/pagination.vue

@@ -0,0 +1,130 @@
+<template>
+    <div id="pagination">
+        <el-pagination
+                @size-change="handleSizeChange"
+                @current-change="currentChange"
+                :current-page.sync="currentPages"
+                :page-size="pageSize"
+                layout="slot, prev, pager, next"
+                :total="total">
+            <span class="total-class">共 {{total}} 条数据</span>
+        </el-pagination>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "paginationPage",
+        data(){
+            return{
+                currentPages:1
+            }
+        },
+        props:['pageSize','currentPage','total',"isReportForm"],
+        watch:{
+            currentPage: {
+                handler(val){
+                    this.currentPages = val
+                },
+            },
+
+        },
+        mounted() {
+            this.currentPages = this.currentPage
+        },
+        methods:{
+            handleSizeChange(value){
+                this.$emit('handleSizeChange',value)
+            },
+            currentChange(value){
+                this.$emit('currentChange',value)
+            },
+        }
+    }
+</script>
+
+<style scoped lang="less">
+@import "../assets/less/variables.less";
+
+#pagination{
+    .total-class{
+        margin-right: 13px;
+        font-weight: 400;
+    }
+    position: absolute;
+    bottom: 0px;
+    right: 0;
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 50px;
+    background-color: @background-color-light;
+    box-shadow: 0px 0px 18px 0px rgba(29, 55, 129, 0.07);
+    border-radius: 5px;
+    /deep/.el-pager{
+        background: @background-color-pagination;
+        border-radius: 15px;
+    }
+    /deep/.el-pagination.is-background .btn-next{
+         width: 30px;
+         height: 30px;
+         background: @background-color-pagination;
+         border-radius: 50%;
+     }
+    /deep/.el-pagination .btn-next{
+        width: 30px;
+        height: 30px;
+        background: @background-color-pagination;
+        border-radius: 50%;
+        padding-left: 0;
+        margin-left:5px ;
+    }
+    /deep/.el-pagination .btn-prev{
+        width: 30px;
+        height: 30px;
+        background: @background-color-pagination;
+        border-radius: 50%;
+        padding-right: 0;
+        margin-right:5px ;
+    }
+    /deep/.el-pagination button{
+        padding: 0;
+        min-width: 30px;
+    }
+    /deep/.el-pager li{
+        background: @background-color-pagination;
+        height: 30px;
+        min-width: 30px;
+        line-height: 30px;
+        font-size: 12px;
+        color: @font-pagination-color;
+    }
+    /deep/.el-pager li:first-child{
+        border-bottom-left-radius: 15px!important;
+        border-top-left-radius: 15px!important;
+    }
+    /deep/.el-pager li:last-child{
+        border-top-right-radius: 15px!important;
+        border-bottom-right-radius: 15px!important;
+    }
+    /deep/.el-pager li.active{
+        width: 30px;
+        height: 30px;
+        min-width: 30px;
+        background: @primary-color;
+        border: 3px solid @border-color-copy;
+        border-radius: 50%;
+        line-height: 24px;
+        color: @font-primary-light-color;
+    }
+    /deep/.el-pagination.is-background .el-pager li:not(.disabled).active{
+        background: @primary-color;
+    }
+    /deep/.el-pagination button:disabled{
+      i{
+        cursor: no-drop;
+      }
+    }
+}
+</style>