Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/App.vue

@@ -11,7 +11,7 @@ export default {
 </script>
 
 <style>
-@import "//at.alicdn.com/t/font_1769104_sg5novwcbz.css";
+@import "//at.alicdn.com/t/font_1769104_vde3fa04tor.css";
 @import "./assets/css/common.css";
 @import "./assets/css/zkcss.css";
 html,

src/assets/css/common.css

@@ -117,4 +117,7 @@
     border-spacing: 0;
     width:250px;
     margin-right: 20px;
+}
+.noline{
+    text-decoration: none;
 }
\ No newline at end of file

src/components/CommodityMan/goodsList.vue

@@ -261,7 +261,7 @@
             <div class="batch-box-right">
                 <el-form class="app-batch" :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
                     <el-form-item v-if="plszMsg.Type==7" label="运费设置">
-                        <el-tag v-if="ruleSelect.RulesName" @close="plszMsg.FreightId=-1,ruleSelect={}" closable>{{ruleSelect.RulesName}}</el-tag>
+                        <el-tag v-if="ruleSelect.RulesName" @close="plszMsg.FreightId=0,ruleSelect={}" closable>{{ruleSelect.RulesName}}</el-tag>
                         <el-button @click="chooseyfDig=true" style="margin-left:10px;" size="small">选择运费</el-button>
                     </el-form-item>
                     <el-form-item v-if="plszMsg.Type==8" label="每人限购">
@@ -293,8 +293,8 @@
                             <el-input v-model="plszMsg.IntegralPresent" style="width:670px;margin-left:15px" type="number" min="1" size="small" placeholder="请输入内容" class="input-with-select">
                                 <el-button slot="append">
                                     分
-                                    <el-radio v-model="plszMsg.IntegralPresentType" :label="1">固定值</el-radio>
-                                    <el-radio v-model="plszMsg.IntegralPresentType" :label="2">百分比</el-radio>
+                                    <el-radio v-model="plszMsg.IntegralPresentType" :label="2">固定值</el-radio>
+                                    <el-radio v-model="plszMsg.IntegralPresentType" :label="1">百分比</el-radio>
                                 </el-button>
                             </el-input>
                         </el-form-item>
@@ -307,8 +307,8 @@
                                <template slot="prepend">最多抵扣</template>
                                 <el-button slot="append">
                                     分
-                                    <el-radio v-model="plszMsg.PointsDeductionType" :label="1">固定值</el-radio>
-                                    <el-radio v-model="plszMsg.PointsDeductionType" :label="2">百分比</el-radio>
+                                    <el-radio v-model="plszMsg.PointsDeductionType" :label="2">固定值</el-radio>
+                                    <el-radio v-model="plszMsg.PointsDeductionType" :label="1">百分比</el-radio>
                                 </el-button>
                             </el-input>
                         </el-form-item>
@@ -354,7 +354,7 @@
             </el-radio-group>
         </div>
         <span slot="footer" class="dialog-footer">
-            <el-button size="small" @click="chooseyfDig = false,ruleSelect={},plszMsg.FreightId=-1">取 消</el-button>
+            <el-button size="small" @click="chooseyfDig = false,ruleSelect={},plszMsg.FreightId=0">取 消</el-button>
             <el-button size="small" @click="chooseyfDig = false" type="primary">确 定</el-button>
         </span>
     </el-dialog> 
@@ -411,13 +411,13 @@ export default {
             plszMsg:{
                 GoodsIds:'',
                 Type:10,
-                FreightId:-1,
+                FreightId:0,
                 LimitBuyGoodsNum:-1,
                 LimitBuyOrderNum:-1,
                 IntegralPresent:0,
-                IntegralPresentType:1,
+                IntegralPresentType:2,
                 PointsDeduction:0,
-                PointsDeductionType:1,
+                PointsDeductionType:2,
                 IsMultipleDeduction:2,
                 IsQuickBuy:2,
                 IsGoodsNegotiable:2,
@@ -438,10 +438,10 @@ export default {
         
         plsetOk(){
             if(this.plszMsg.Type==7){
-                if(this.plszMsg.FreightId==-1){
-                    this.Error("请选择运费规则");
-                    return;
-                }
+                // if(this.plszMsg.FreightId==0){
+                //     this.Error("请选择运费规则");
+                //     return;
+                // }
             }
             if(this.plszMsg.Type==8){
                 if(this.plszMsg.BuyGoodsNumState){
@@ -471,13 +471,13 @@ export default {
             this.plszMsg={
                 GoodsIds:this.keepGoodsIds,
                 Type:type,
-                FreightId:-1,
+                FreightId:0,
                 LimitBuyGoodsNum:-1,
                 LimitBuyOrderNum:-1,
                 IntegralPresent:0,
-                IntegralPresentType:1,
+                IntegralPresentType:2,
                 PointsDeduction:0,
-                PointsDeductionType:1,
+                PointsDeductionType:2,
                 IsMultipleDeduction:2,
                 IsQuickBuy:2,
                 IsGoodsNegotiable:2,

src/components/UserMan/setMember.vue

@@ -131,8 +131,10 @@
                         <span @click="addEquityList" style="color: rgb(53, 53, 53);font-size: 14px;">新增权益</span>
                     </div>
                 </el-form-item>
-                <el-form-item label="会员规则" prop="MemberSpecification">
-                    
+                <el-form-item class="hygz" label="会员规则" prop="MemberSpecification">
+                    <div style="width:455px">
+                        <UE :defaultMsg=defaultMsg :config=config ref="ue" ></UE>
+                    </div>
                 </el-form-item>
             </el-form> 
             
@@ -147,16 +149,20 @@
   </div>
 </template>
 <script>
+import UE from '@/components/global/UE.vue'
 import ChooseImg from "@/components/global/ChooseImg.vue";
   export default {
     components: {
-      ChooseImg
+      ChooseImg,UE
     },
     data() {
       return {
-        icon1:'',
-        icon2:'',
-        icon3:'',
+        loading:false,
+        defaultMsg: '',
+        config: {
+            initialFrameWidth: null,
+            initialFrameHeight: 350,
+        },
         currentPage4:3,
         changeState:false,
         val:'',
@@ -210,9 +216,15 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
       };
     },
     created() {
+        
+    },
+    mounted(){
+        console.log("this.$refs.ue",this.$refs.ue)
         if(this.$route.query.GradeId){
             this.GradeId=this.$route.query.GradeId;
             this.getData()
+        }else{
+            this.$refs.ue.InitData();
         }
     },
     methods: {
@@ -251,9 +263,10 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
             this.addMsg.EquityList.splice(index, 1);
         },
         Save(formName){
-            
             this.$refs[formName].validate((valid) => {
                 if (valid) {
+                    let content = this.$refs.ue.getUEContent();
+                    this.addMsg.MemberSpecification=content;
                     let cmd="/api/user/SetMemberGradeInfo";
                     this.apipost(cmd,this.addMsg,
                         res => {
@@ -286,21 +299,22 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
                 this.loading=false;
                 if(res.data.resultCode==1){
                     this.addMsg=res.data.data;
-                    this.addMsg.MallBaseId=this.getLocalStorage().MallBaseId
+                    this.addMsg.MallBaseId=this.getLocalStorage().MallBaseId;
+                    this.defaultMsg=res.data.data.MemberSpecification;
+                    this.$refs.ue.InitData();
                 }
                 
             })
         },
 
     },
-    mounted() {
-      
-    }
   };
 
 </script>
 <style>
-
+.setMember .hygz .el-form-item__content{
+    line-height:inherit!important;
+}
 .setMember .setTable .el-table__body .cell{
     display: flex;
     align-items: center;

src/components/global/UE.vue

+<template>
+  <div>
+    <script type="text/plain" id="editor"></script>
+    <!-- 选择图片 -->
+    <el-dialog title="选择文件" :visible.sync="changeState" width="1240px">
+        <ChooseImg  @SelectId="SelectId"></ChooseImg>   
+    </el-dialog>
+  </div>
+</template>
+<script>
+  import ChooseImg from "@/components/global/ChooseImg.vue";
+  export default {
+    components: {
+      ChooseImg
+    },
+    name: 'UE',
+    data () {
+      return {
+        editor: null,
+        changeState:false,
+      }
+    },
+    props: {
+      defaultMsg: {
+        type: String
+      },
+      config: {
+        type: Object
+      },
+    },
+    mounted() {
+      
+    },
+    methods: {
+      InitData(){
+        const _this = this;
+        this.editor = UE.getEditor('editor', this.config); // 初始化UE
+        this.editor.addListener("ready", function () {
+          _this.editor.setContent(_this.defaultMsg); // 确保UE加载完成后，放入内容。
+        });
+        this.loadUe();
+      },
+      SelectId(e) {
+          if (e) {
+              let html = '';
+              this.ue = UE.getEditor('editor');
+              html= '<img src="' + this.domainManager().ImageUrl+e.url + '" style="max-width: 100%;">';
+              this.ue.execCommand('inserthtml', html);
+          }
+          this.changeState=false;
+      },
+      getUEContent() { // 获取内容方法
+        return this.editor.getContent()
+      },
+      loadUe() {
+        const vm = this;
+        this.ue = UE.getEditor('editor');
+        // this.ue.addListener('ready', editor => {
+        //     if (this.tempContent) {
+        //         this.ue.setContent(this.tempContent);
+        //     }
+        // });
+        // this.ue.addListener('keyup', editor => {
+        //     this.isInputChange = true;
+        //     this.$emit('input', this.ue.getContent());
+        // });
+        // this.ue.addListener('contentChange', editor => {
+        //     this.isInputChange = true;
+        //     this.$emit('input', this.ue.getContent());
+        // });
+        let self = this;
+        UE.registerUI('appinsertimage', (editor, uiName) => {
+            return new UE.ui.Button({
+                name: uiName,
+                title: '插入图片',
+                //添加额外样式，指定icon图标，这里默认使用一个重复的icon
+                cssRules: 'background-position: -381px 0px;',
+                onclick() {
+                    self.ue = editor
+                    vm.changeState = true;
+                },
+            });
+        });
+    }
+    },
+    destroyed() {
+      this.editor.destroy();
+    },
+    
+  }
+</script>
\ No newline at end of file

src/components/sallCenter/plugin/coupon.vue

+<style>
+  .diy-coupon {
+    width: 100%;
+    padding: 16px;
+    min-height: 150px;
+    overflow-x: auto;
+    padding-left: 24px;
+  }
+
+  .diy-coupon .diy-coupon-one {
+    width: 256px;
+    height: 130px;
+    background-repeat: no-repeat;
+    background-size: cover;
+    background-position: center;
+    margin-right: 24px;
+    flex: none;
+  }
+
+  .diy-coupon .diy-coupon-one .right {
+    width: 1.6rem;
+    font-size: 26px;
+    line-height: 1.25;
+    text-align: center;
+    margin-right: 2px;
+  }
+
+</style>
+<template>
+  <div :class="{'active':couponData.isCked}">
+    <div class="diy-component-options" v-if="couponData.isCked">
+      <el-button type="primary" icon="el-icon-delete" style="left: -25px; top: 0px;" @click="delPlugin()"></el-button>
+      <el-button type="primary" icon="el-icon-document-copy" style="left: -25px; top: 30px;"></el-button>
+      <el-button type="primary" icon="el-icon-arrow-up" v-if="index>0" @click="resetSord(0)"
+        style="right: -25px; top: 0;"></el-button>
+      <el-button type="primary" icon="el-icon-arrow-down" v-if="index!=dataLeng-1" @click="resetSord(1)"
+        style="right: -25px; top: 30px;"></el-button>
+    </div>
+    <div class="diy-component-preview">
+      <div class="diy-coupon" flex="dir:left" :style="cListStyle">
+        <div class="diy-coupon-one" flex="dir:left" :style="cStyle1" v-for="(item,index) in 2" :key="index+'s'">
+          <div style="text-align: center;width: 215px">
+            <div style="height: 80px;line-height: 80px;font-size: 28px">￥1000</div>
+            <div style="height: 50px;line-height: 50px;font-size: 24px">满200元可用</div>
+          </div>
+          <div class="right" flex="main:center cross:center">立即领取</div>
+        </div>
+        <div class="diy-coupon-one" flex="dir:left" :style="cStyle2" v-for="(item,sindex) in 2" :key="sindex+'d'">
+          <div style="text-align: center;width: 215px">
+            <div style="height: 80px;line-height: 80px;font-size: 28px">￥1000</div>
+            <div style="height: 50px;line-height: 50px;font-size: 24px">满200元可用</div>
+          </div>
+          <div class="right" flex="main:center cross:center">已领取</div>
+        </div>
+      </div>
+    </div>
+    <div class="diy-component-edit" v-if="couponData.isCked">
+      <el-form label-width="100px" @submit.native.prevent>
+        <el-form-item label="字体颜色">
+          <el-color-picker size="small" v-model="data.textColor"></el-color-picker>
+        </el-form-item>
+        <el-form-item label="不可领取">
+          <el-tooltip class="item" effect="dark" content="建议尺寸256*130" placement="top">
+            <el-button @click="choicImg=true,ckedIndex=1" size="mini">选择图片</el-button>
+          </el-tooltip>
+          <div class="zk_pic_box" style="width:100px;height:100px;" flex="main:center cross:center"
+            :style="{backgroundImage:'url(' + getIconLink(data.receiveBg) + ')'}">
+            <el-button type="danger"
+              v-if="data.receiveBg!='https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/icon-coupon-no.png'"
+              class="image-delete" size="mini" icon="el-icon-close"
+              @click.stop="data.receiveBg='https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/icon-coupon-no.png'"
+              circle></el-button>
+          </div>
+        </el-form-item>
+        <el-form-item label="可领取">
+          <el-tooltip class="item" effect="dark" content="建议尺寸256*130" placement="top">
+            <el-button size="mini" @click="choicImg=true,ckedIndex=2">选择图片</el-button>
+          </el-tooltip>
+          <div class="zk_pic_box" style="width:100px;height:100px;" flex="main:center cross:center"
+            :style="{backgroundImage:'url(' + getIconLink(data.unclaimedBg) + ')'}">
+            <el-button type="danger"
+              v-if="data.unclaimedBg!='https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/icon-coupon-index.png'"
+              class="image-delete" size="mini" icon="el-icon-close"
+              @click.stop="data.unclaimedBg='https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/icon-coupon-index.png'"
+              circle></el-button>
+          </div>
+        </el-form-item>
+        <el-form-item label="背景颜色">
+          <el-color-picker v-model="data.backgroundColor" size="small"></el-color-picker>
+          <el-input type="text" v-model="data.backgroundColor" size="small" style="width: 80px; margin-right: 25px;">
+          </el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <!-- 选择图片文件 -->
+    <el-dialog title="选择文件" :visible.sync="choicImg" width="1240px">
+      <ChooseImg @SelectId="SelectId"></ChooseImg>
+    </el-dialog>
+  </div>
+</template>
+<script>
+  import ChooseImg from "@/components/global/ChooseImg.vue";
+
+  export default {
+    props: ["couponData", "index", "dataLeng"],
+    components: {
+      ChooseImg
+    },
+    data() {
+      return {
+        choicImg: false,
+        data: this.couponData.data,
+        ckedIndex: -1,
+        position: 'center center',
+        repeat: 'no-repeat'
+      };
+    },
+    created() {
+
+    },
+    methods: {
+      //向父组件传值 并调用排序
+      resetSord(IsUp) {
+        this.$emit('getSord', this.index, IsUp);
+      },
+      //点击触发父组件删除
+      delPlugin() {
+        this.$emit('comDelPlugin', this.index);
+      },
+      //选择图片
+      SelectId(msg) {
+        if (this.ckedIndex == 1) {
+          this.data.receiveBg = msg.url;
+        } else if (this.ckedIndex == 2) {
+          this.data.unclaimedBg = msg.url;
+        }
+        this.choicImg = false;
+      },
+      //判断是否包含http
+      getIconLink(url) {
+        let str = ''
+        if (url.indexOf('http') != -1) {
+          str = url
+        } else {
+          str = 'http://viitto-1301420277.cos.ap-chengdu.myqcloud.com' + url
+        }
+        return str;
+      }
+    },
+    computed: {
+      cListStyle() {
+        if (this.data.backgroundColor) {
+          return `background-color:${this.data.backgroundColor};background-image:url(${this.getIconLink(this.data.backgroundPicUrl)});background-size:${this.data.backgroundWidth}% ${this.data.backgroundHeight}%;background-repeat:${this.repeat};background-position:${this.position}`
+        } else {
+          return `background-image:url(${this.getIconLink(this.data.backgroundPicUrl)});background-size:${this.data.backgroundWidth}% ${this.data.backgroundHeight}%;background-repeat:${this.repeat};background-position:${this.position}`
+        }
+      },
+      cStyle1() {
+        return `background-image: url('${this.getIconLink(this.data.unclaimedBg)}');` +
+          `color: ${this.data.textColor}`;
+      },
+      cStyle2() {
+        return `background-image: url('${this.getIconLink(this.data.receiveBg)}');` +
+          `color: ${this.data.textColor}`;
+      },
+    },
+    mounted() {
+
+    }
+  };
+
+</script>

src/main.js

@@ -9,6 +9,11 @@ import ElementUI from 'element-ui';
 import 'element-ui/lib/theme-chalk/index.css';
 import echarts from 'echarts'
 
+import '../static/UE/ueditor.config.js'
+import '../static/UE/ueditor.all.min.js'
+import '../static/UE/lang/zh-cn/zh-cn.js'
+import '../static/UE/ueditor.parse.min.js'
+
 Vue.use(ElementUI);
 
 import commonUtils from './assets/utils/commonUtils'

static/UE/dialogs/anchor/anchor.html

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <title></title>
+        <style type="text/css">
+            *{color: #838383;margin: 0;padding: 0}
+            html,body {font-size: 12px;overflow: hidden; }
+            .content{padding:5px 0 0 15px;}
+            input{width:210px;height:21px;line-height:21px;margin-left: 4px;}
+        </style>
+    </head>
+    <body>
+        <div class="content">
+            <span><var id="lang_input_anchorName"></var></span><input id="anchorName"  value="" />
+        </div>
+        <script type="text/javascript" src="../internal.js"></script>
+        <script type="text/javascript">
+            var anchorInput = $G('anchorName'),
+                node = editor.selection.getRange().getClosedNode();
+            if(node && node.tagName == 'IMG' && (node = node.getAttribute('anchorname'))){
+                anchorInput.value = node;
+            }
+            anchorInput.onkeydown = function(evt){
+                evt = evt || window.event;
+                if(evt.keyCode == 13){
+                    editor.execCommand('anchor', anchorInput.value);
+                    dialog.close();
+                    domUtils.preventDefault(evt)
+                }
+            };
+            dialog.onok = function (){
+                editor.execCommand('anchor', anchorInput.value);
+                dialog.close();
+            };
+            $focus(anchorInput);
+        </script>
+    </body>
+</html>
\ No newline at end of file