askbot-dragon 0.7.92 → 0.7.93

package/src/components/myPopup.vue

@@ -0,0 +1,71 @@
+<template>
+  <div class="container">
+    <div class="top-container">
+      <div class="close">取消</div>
+      <div class="sure">确定</div>
+    </div>
+    <van-list v-model="loading" :finished="finished" finished-text="没有更多了" :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>
+<script>
+export default {
+  props: {
+    finished:{
+      type: Boolean,
+      default: false
+    },
+    list:{
+      type:Array,
+      default:() =>{
+        return []
+      }
+    }
+  },
+  data() {
+    return {
+      show: false,
+      loading: false
+    }
+  },
+  methods: {
+    onload() {
+      this.$emit('onload')
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.container {
+  width: 100%;
+  height: 100%;
+  .top-container {
+    width: 100%;
+    height: 50px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 20px;
+    box-sizing: border-box;
+    .sure {
+      color: #366aff;
+    }
+    .close {
+      color: #cccccc;
+    }
+  }
+  .list-container {
+    width: 100%;
+    height: calc(100% - 50px);
+  }
+}
+</style>

package/src/components/popup.vue

@@ -0,0 +1,184 @@
+<template>
+  <div class="popUp">
+    <div class="topBtn">
+      <span class="cancel" @click="closeBtn">取消</span>
+      <span class="sure" @click="sure">确定</span>
+    </div>
+    <slot name="popup-header" class="popup-header"></slot>
+    <div class="popup-content">
+      <div
+          class="filter-item"
+          v-for="(item,index) in options"
+          :key="index"
+          @click="checked(item,index)"
+      >
+        <div :class="[checkIdList.includes(item[props.value]) && 'setColor', 'label']">{{item[props.label]}}</div>
+      </div>
+    </div>
+    <div class="popup-footer">
+      <slot name="popup-footer"></slot>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      checkOptions: [],
+      checkIdList:[],
+      visable:false
+    }
+  },
+  props: {
+    options: {
+      type: Array,
+      default:function() {
+        return []
+      }
+    },
+    defaultValue: {
+      type: Array,
+      default:function() {
+        return []
+      }
+    },
+    props: {
+      type: Object,
+      default(){
+        return{
+          label: 'label',
+          value: 'value'
+        }
+      }
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    }
+  },
+  methods: {
+    checked(item) {
+      if(this.multiple) {
+        let count = this.checkIdList.findIndex(element => { return element == item[this.props.value] } )
+        if(count !== -1) {
+          this.checkIdList.splice(count,1)
+          this.checkOptions.splice(count,1)
+        } else {
+          this.checkIdList.push(item[this.props.value])
+          this.checkOptions.push(item)
+        }
+      } else {
+        this.checkIdList = []
+        this.checkOptions = []
+        this.checkIdList.push(item[this.props.value])
+        this.checkOptions.push(item)
+      }
+    },
+    sure() {
+      if(this.checkOptions.length == 0 && this.checkIdList == 0){
+        this.$emit('onConfim',false,false)
+        return
+      }
+      let option = JSON.parse(JSON.stringify(this.checkOptions))
+      let list = JSON.parse(JSON.stringify(this.checkIdList))
+      if(this.multiple) {
+        this.$emit('onConfim',option, list)
+      } else {
+        this.$emit('onConfim',option[0], list[0])
+      }
+    },
+    closeBtn(){
+      this.$emit('onclose')
+    }
+  },
+  watch: {
+    defaultValue: {
+      handler(value) {
+        if (!value) {
+          // 定位当前位置
+        /*  this.options.forEach(item => {})*/
+        }
+      },
+      deep: true,
+      immediate: true
+    },
+    visable(value) {
+      if(value) {
+        console.log(this.defaultValue,'=====');
+        this.checkOptions = []
+        if(Array.isArray(this.defaultValue)) {
+          this.checkIdList = [...this.defaultValue]
+          this.checkIdList.forEach(item =>{
+            this.options.forEach(res =>{
+              if(item == res[this.props.value]) {
+                this.checkOptions.push(res)
+              }
+            })
+          })
+        } 
+        // else {
+        //   this.checkIdList = this.defaultValue
+        //   let obj = this.options.find(item =>{ return item[this.props.value] == this.defaultValue[0] })
+        //   obj && this.checkOptions.push(obj)
+        // }
+      } else {
+        this.checkOptions = []
+        this.checkIdList = []
+      }
+    }
+  },
+  
+}
+</script>
+
+<style lang="less" scoped>
+.popup-content {
+  /*padding-top: 8px;*/
+  .filter-item {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 48px;
+    .setColor {
+      color: #366aff;
+    }
+    .label {
+      display: block;
+      width: 80%;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space:nowrap;
+      text-align: center;
+    }
+  }
+}
+.topBtn {
+    width: 100%;
+    height: 40px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    box-sizing: border-box;
+    padding: 0 20px;
+    .cancel {
+      color: #606266;
+    }
+    .sure {
+      color: #366aff;
+    }
+  }
+.popup-footer {
+  position: absolute;
+  max-height: 50px;
+  bottom: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  color: #366aff;
+  background: #eff2f5;
+  /*border-radius: 28px;*/
+}
+</style>

package/src/components/tree.vue

@@ -0,0 +1,159 @@
+<template>
+  <div id="tree">
+    <div class="tree-header">
+      <span class="cacel" @click="cancelBtn">取消</span>
+      <span class="primary" @click="saveData">确认</span>
+    </div>
+    <div class="tree-container">
+      <el-tree :data="dataTree"
+               :props="defaultProps"
+               ref="dataTree"
+               node-key="value"
+      >
+       <span class="custom-tree-node" slot-scope="{ node,data}">
+        <span class="tree-label">{{ node.label }}</span>
+        <span>
+           <el-checkbox v-model="data.checked" v-if="dataOptions.extInfo.selectType ==='多选'"></el-checkbox>
+          <el-radio v-model="checked" v-else :label="data.value"></el-radio>
+        </span>
+      </span>
+      </el-tree>
+    </div>
+<!--    <div class="footer">
+      <el-button>取 消</el-button>
+      <el-button type="primary" @click="saveData">确 认</el-button>
+    </div>-->
+  </div>
+</template>
+
+<script>
+export default {
+  name: "tree",
+  data(){
+    return{
+      defaultProps:{},
+      checked:'',
+      dataTree:[],
+      checkList:[],
+      checkDatas:[]
+    }
+  },
+  props:["dataOptions"],
+  methods:{
+     saveData(){
+      this.checkList = []
+       this.checkDatas = []
+       this.ergodicData(this.dataTree,this.checkList)
+      this.$emit('saveData',this.checkList,this.checkDatas)
+    },
+    cancelBtn(){
+       this.$emit('cancelBtn')
+    },
+    ergodicData(list){
+      list.forEach(item=>{
+        if (item.checked){
+          let data = this.$refs.dataTree.getNode(item)
+          let checkList = []
+          let arr = this.serchParent(data,checkList)
+          this.checkList.push(arr)
+          this.checkDatas.push(item)
+        }
+        if (item.value === this.checked){
+          let data = this.$refs.dataTree.getNode(item)
+          let checkList = []
+          let arr = this.serchParent(data,checkList)
+          this.checkList = arr
+          this.checkDatas = [item]
+        }
+        if (item.children){
+          this.ergodicData(item.children)
+        }
+      })
+    },
+    serchParent(node,list) {
+      if(node) {
+        if(Object.prototype.toString.call(node.data) == '[object Object]') {
+          list.unshift(node.data.value)
+        }
+        if(node.parent) {
+          list = this.serchParent(node.parent,list)
+        }
+      }
+      return list
+    },
+  },
+  mounted() {
+    if (this.dataOptions.extInfo.cascadeDown.options){
+      this.dataTree = this.dataOptions.extInfo.cascadeDown.options
+    }
+    else if (this.dataOptions.extInfo.cascade){
+      this.dataTree = this.dataOptions.extInfo.cascade
+    }
+    else if (this.dataOptions.extInfo.cascadeDown && this.dataOptions.extInfo.cascadeDown[0]){
+      this.dataTree = this.dataOptions.extInfo.cascadeDown[0].options
+    }
+  }
+};
+</script>
+
+<style scoped lang="less">
+#tree{
+  height: 100%;
+  overflow: hidden;
+  /deep/.el-tree-node__content{
+    height: 38px;
+    line-height: 38px;
+  }
+  .tree-header{
+    height: 30px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin: 0 20px;
+    width: calc(100% - 40px);
+    /*font-size: 14px;*/
+    padding-bottom: 30px;
+    .primary{
+      color: #366aff;
+    }
+    .cacel{
+      color: #969799;
+    }
+  }
+  .tree-container{
+    height:260px;
+    overflow-y: scroll;
+    overflow-x: hidden;
+  }
+  .custom-tree-node{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: calc(100% - 40px);
+    font-size: 14px;
+    .tree-label{
+      max-width: 160px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+    /deep/.el-radio__label{
+      display: none;
+    }
+  }
+  .footer{
+    position: absolute;
+    bottom: 0;
+    height: 60px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: calc(100% - 40px);
+    margin: 0 20px;
+    .el-button{
+      flex: 1;
+      border-radius: 9px;
+    }
+  }
+}
+</style>

package/src/components/utils/format_date.js

@@ -13,7 +13,14 @@ const formatDate = (fmt) => { //author: meizz
         if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
     return fmt;
 }
-
-export { formatDate };
+function forMatTime(value){
+    let startTime = ''
+    let currentTime = new Date(), year = currentTime.getFullYear(),
+        month = currentTime.getMonth() + 1 < 10 ? '0' + (currentTime.getMonth() + 1) : currentTime.getMonth() + 1,
+        day = currentTime.getDate() < 10 ? '0' + currentTime.getDate() : currentTime.getDate();
+    startTime = year + "-" + month + "-" + day +' ' + value;
+    return new Date(startTime)
+}
+export { formatDate,forMatTime };
 
 // new Date("2019-12-14T00:09:16.000+0000").Format("yyyy-MM-dd hh:mm:ss")

package/vue.config.js

@@ -23,6 +23,15 @@ module.exports = {
                     '^/open': '/'
                 }
             },
+            '/order-api': {
+                target: 'http://master.test.askbot.cn:32022',
+                /*target:'http://new-test.guoranbot.com:30672',*/
+                changeOrigin: true,
+                ws: true,
+                pathRewrite: {
+                    '^/order-api': '/'
+                }
+            },
         },
     },
     configureWebpack: {