修改样式

2511e443 · Mac · 25c14bed · 2511e443 · 2511e443 · 2511e443
Commit 2511e443 authored Oct 26, 2021 by Mac
9 changed files
--- a/public/static/UE/ueditor.config.js
+++ b/public/static/UE/ueditor.config.js
@@ -46,7 +46,7 @@
            'forecolor',//字体颜色
            'justifyleft', 'justifycenter', 'justifyright',
            'self-image','self-attachment','self-video',
-            'emotion',
+            // 'emotion',
            'inserttable',
            //'music'
            //'attachment', //附件

--- a/src/components/sale/tougao-form.vue
+++ b/src/components/sale/tougao-form.vue
@@ -284,8 +284,8 @@
                    <div style="margin:20px 0;" v-html="setingObj.DataObj.Content"></div>
                    <div style="margin-top:20px;display:flex;">
                        <div style="margin-bottom:10px;">封面图：</div>
-                        <div class="tougao_ImgList">
-                            <el-image style="width: 100%; height: 100%" :src="setingObj.DataObj.CoverImagePath" fit="cover"></el-image>
+                        <div class="tougao_ImgList" style="width: 210px;height: 90px;">
+                            <el-image v-if="setingObj.DataObj.CoverImagePath && setingObj.DataObj.CoverImagePath!=''" style="width: 100%; height: 100%" :src="setingObj.DataObj.CoverImagePath" fit="cover"></el-image>
                        </div>
                    </div>
                    <div style="margin-top:20px;display:flex;">

--- a/src/pages/teacher/components/alladdsc.vue
+++ b/src/pages/teacher/components/alladdsc.vue
@@ -12,9 +12,9 @@
            <q-select filled stack-label option-value="Id" option-label="Name" v-model="addMsg.MediaGroupId"
              @input="$forceUpdate()" ref="Id" :options="allclassifyList" label="分组" :dense="false" emit-value
              map-options />
-            <q-select filled stack-label option-value="Id" option-label="Name" class="q-mt-lg"
+            <!-- <q-select filled stack-label option-value="Id" option-label="Name" class="q-mt-lg"
              v-model="addMsg.PlatformType" @input="$forceUpdate()" ref="Id" :options="platTypeList" label="平台类型"
-              :dense="false" emit-value map-options />
+              :dense="false" emit-value map-options /> -->
            <!-- <q-input clearable filled v-model="addMsg.MediaName" placeholder="请输入图片名称" class="q-mt-lg" maxlength="20" /> -->

            <div style="margin-top: 15px;">
@@ -62,9 +62,9 @@
            <q-select filled stack-label option-value="Id" option-label="Name" v-model="addMsg.MediaGroupId"
              @input="$forceUpdate()" ref="Id" :options="allclassifyList" label="分组" :dense="false" emit-value
              map-options />
-            <q-select filled stack-label option-value="Id" option-label="Name" class="q-mt-lg"
+            <!-- <q-select filled stack-label option-value="Id" option-label="Name" class="q-mt-lg"
              v-model="addMsg.PlatformType" @input="$forceUpdate()" ref="Id" :options="platTypeList" label="平台类型"
-              :dense="false" emit-value map-options />
+              :dense="false" emit-value map-options /> -->
            <q-input clearable filled v-model="addMsg.MediaName" placeholder="请输入音频名称" class="q-mt-lg" maxlength="20" />
            <div style="margin-top: 15px;">
              <div style="width:70px">上传音频:</div>
@@ -108,9 +108,9 @@
            <q-select filled stack-label option-value="Id" option-label="Name" v-model="addMsg.MediaGroupId"
              @input="$forceUpdate()" ref="Id" :options="allclassifyList" label="分组" :dense="false" emit-value
              map-options />
-            <q-select filled stack-label option-value="Id" option-label="Name" class="q-mt-lg"
+            <!-- <q-select filled stack-label option-value="Id" option-label="Name" class="q-mt-lg"
              v-model="addMsg.PlatformType" @input="$forceUpdate()" ref="Id" :options="platTypeList" label="平台类型"
-              :dense="false" emit-value map-options />
+              :dense="false" emit-value map-options /> -->
            <q-input clearable filled v-model="addMsg.MediaName" placeholder="请输入视频名称" class="q-mt-lg" maxlength="20" />
            <div style="margin-top: 15px;">
              <div style="width:80px">视频封面图:</div>

--- a/src/pages/teacher/components/audiomaterial.vue
+++ b/src/pages/teacher/components/audiomaterial.vue
@@ -19,18 +19,7 @@
            <div style="display:flex;align-items: center;justify-content: space-between;margin-bottom: 5px;">
              <div>{{x.UpdateTime}}</div>
              <div>
-                <div style="display:inline-block;margin-right:5px;position:relative;top:-3px;">
-                    <q-icon v-if="x.Media_Id && x.Media_Id!=''" size="20px" name="iconfont icon-yiqueren" color="green">
-                    <q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
-                        已更新
-                    </q-tooltip>
-                    </q-icon>
-                    <q-icon v-if="x.Media_Id==''" size="20px" name="iconfont icon-weiwancheng" color="red">
-                    <q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
-                        未更新
-                    </q-tooltip>
-                    </q-icon>
-                </div>
+                
                <i class="el-icon-edit-outline" style="font-size: 20px;color: #1890ff;" @click.stop="goedit(x)"></i>
              </div>
            </div>

--- a/src/pages/teacher/components/chooseApplet.vue
+++ b/src/pages/teacher/components/chooseApplet.vue
@@ -131,7 +131,15 @@
                    })
                    return
                }
-                if (this.msg.type == 1) {
+                if (this.msg.route == '' || this.msg.route==null) {
+                    this.$q.notify({
+                        type: 'negative',
+                        message: `小程序路径不能为空`,
+                        position: 'top'
+                    })
+                    return
+                }
+                if (this.msg.type == 1 || this.msg.type == 3) {
                    if (this.msg.title == '') {
                        this.$q.notify({
                            type: 'negative',
@@ -141,6 +149,28 @@
                        return
                    }

+                }
+                if (this.msg.type == 2 || this.msg.type==3) {
+                    if (this.msg.imgUrl == '') {
+                        this.$q.notify({
+                            type: 'negative',
+                            message: `请选择图片`,
+                            position: 'top'
+                        })
+                        return
+                    }
+
+                }
+                if (this.msg.type==3) {
+                    if (this.msg.imgUrl == '') {
+                        this.$q.notify({
+                            type: 'negative',
+                            message: `请选择图片`,
+                            position: 'top'
+                        })
+                        return
+                    }
+
                }
                this.$emit('getresult', this.msg);

@@ -151,8 +181,6 @@
            SelectId(obj) {
                this.getNaturalImgSize(obj[0].ImageUrl, k => {//获取图片比例
                    let qualified = k.qualified
-                    this.msg.imgUrl = obj[0].ImageUrl;
-                        this.getImgChoice = false;
                    if (qualified == true) {
                        this.msg.imgUrl = obj[0].ImageUrl;
                        this.getImgChoice = false;

--- a/src/pages/teacher/components/imgmaterial.vue
+++ b/src/pages/teacher/components/imgmaterial.vue
@@ -19,7 +19,7 @@
          <q-card-section>
            <div style="display:flex;align-items: center;justify-content: space-between;margin-bottom: 5px;">
              <div>{{x.UpdateTime}}</div>
-              <div style="display:inline-block;margin-right:5px;position:relative;top:-3px;">
+              <!-- <div style="display:inline-block;margin-right:5px;position:relative;top:-3px;">
                <q-icon v-if="x.Media_Id && x.Media_Id!=''" class="absolute all-pointer-events" size="20px"
                name="iconfont icon-yiqueren" color="green" style="top: -7px;">
                <q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
@@ -32,13 +32,13 @@
                  未更新
                </q-tooltip>
              </q-icon>
-              </div>
+              </div> -->
              <div>
                <i class="el-icon-edit-outline" style="font-size: 20px;color: #1890ff;" @click.stop="goedit(x)"></i>
              </div>
            </div>
            <q-img :src="x.ImageUrl" class="imgstyle"></q-img>
-            <div class="onetext" style="margin-top: 5px;">上传者：{{x.UpdateBy}}</div>
+            <div class="onetext" style="margin-top: 5px;">上传者：{{x.UpdateByName}}</div>
            <div class="onetext" style="margin-top: 5px;">分组：{{x.MediaGroupName}}</div>
          </q-card-section>
        </q-card>

--- a/src/pages/teacher/components/videomaterial.vue
+++ b/src/pages/teacher/components/videomaterial.vue
@@ -18,28 +18,13 @@
                        <div style="display:flex;align-items: center;justify-content: space-between;margin-bottom: 5px;">
                            <div>{{x.UpdateTime}}</div>
                            <div>
-                            <div style="display:inline-block;margin-right:5px;position:relative;top:-3px;">
-                                <q-icon
-                                    v-if="x.Media_Id && x.Media_Id!=''" 
-                                    size="20px" name="iconfont icon-yiqueren" color="green" >
-                                    <q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
-                                        已更新
-                                    </q-tooltip>
-                                </q-icon>
-                                <q-icon
-                                    v-if="x.Media_Id==''"
-                                    size="20px" name="iconfont icon-weiwancheng" color="red" >
-                                    <q-tooltip anchor="top middle" self="bottom middle" :offset="[10, 10]">
-                                        未更新
-                                    </q-tooltip>
-                                </q-icon>
-                            </div>
+                         
                            <i class="el-icon-edit-outline" style="font-size: 20px;color: #1890ff;"
                                @click.stop="goedit(x)"></i>
                            </div>
                        </div>
-                        <video width="260" height="180" controls="controls" v-if="x.Path">
-                            <source :src="x.Path" type="video/mp4" />
+                        <video width="260" height="180" :src="x.Path" controls="controls" v-if="x.Path">
+                            <!-- <source :src="x.Path" type="video/mp4" /> -->
                        </video>
                        <div class="onetext" style="margin-top: 5px;">视频名称：{{x.MediaName}}</div>
                        <div class="onetext" style="margin-top: 5px;">分组：{{x.MediaGroupName}}</div>

--- a/src/pages/teacher/contribution/addimageText.vue
+++ b/src/pages/teacher/contribution/addimageText.vue
@@ -74,9 +74,9 @@
            </div>
        </div> -->
        <div class="box_r">
-            <div style="width: 100%;display: flex;align-items: center;justify-content: center;" v-if="addMsg.Type==1">
+            <div style="width: 100%;display: flex;align-items: center;justify-content: center;" v-if="addMsg.Type==1 || addMsg.Type==2">
                <q-btn-group push>
-                    <q-btn-dropdown push label="图片">
+                    <!-- <q-btn-dropdown push label="图片" default>
                        <q-list>
                            <q-item>
                                <el-upload :action="importFileUrl2" :multiple="false" :on-success="successUpload"
@@ -88,19 +88,15 @@
                                从图片库选择
                            </q-item>
                        </q-list>
-                    </q-btn-dropdown>
+                    </q-btn-dropdown> -->
+                    <q-btn push label="图片" @click="getChoice(1),iscover=false" :disable="addMsg.Type==2?true:false"/>
+
                    <!-- <q-btn push label="视频" @click="getChoice(3),iscover=false" /> -->
-                    <q-btn push label="音频" @click="getChoice(2),iscover=false" />
+                    <!-- <q-btn push label="音频" @click="getChoice(2),iscover=false" /> -->
                    <!-- <q-btn push label="超链接" @click="hyperlinks" /> -->
                    <q-btn push label="小程序" @click="getapplet" />
                </q-btn-group>
            </div>
-            <div style="width: 100%;display: flex;align-items: center;justify-content: center;" v-if="addMsg.Type==2">
-                <q-btn-group push>
-                
-                    <q-btn push label="小程序" @click="getapplet" />
-                </q-btn-group>
-            </div>
            <q-input clearable filled v-model="addMsg.Title" label="标题" maxlength="64" counter
                v-if="this.addMsg.Type != 2 && this.addMsg.Type != 5" style="margin-top: 20px;" />
            <q-input clearable filled v-model="addMsg.Author" label="作者" maxlength="8" counter v-if="addMsg.Type == 1"
@@ -316,7 +312,7 @@
                this.addMsg.Type = this.$route.query.type;
                if (this.addMsg.Type == 2 || this.addMsg.Type == 3) {
                    this.config.initialFrameHeight = 200;
-                    this.config.toolbars = [['undo', 'redo', 'link', 'unlink', 'emotion']]
+                    this.config.toolbars = [['undo', 'redo', 'link', 'unlink', ]]

                }
                if (this.addMsg.Type == 2) {
@@ -361,8 +357,6 @@
                getContributeInfo({ ContributeId: this.addMsg.Id }).then(res => {
                    if (res.Code == 1) {
                        this.addMsg = res.Data
-                        // this.addMsg.Content = res.Data.Content.replace(/<p><mp-miniprogram[^>]*>(.|\n)*<\/mp-miniprogram><\/p>/g,'')
-                        // console.log(this.addMsg.Content,'this.addMsg.Content')
                        if (this.addMsg.Type == 1) {
                            this.coverimg = res.Data.CoverImagePath
                        } else if (this.addMsg.Type == 4) {

--- a/src/pages/teacher/contribution/ue/contributionUE.vue
+++ b/src/pages/teacher/contribution/ue/contributionUE.vue
@@ -168,7 +168,7 @@
          // 给公众号的写法
          html += `<mp-miniprogram data-time="${dataTime}" data-miniprogram-appid="${data.appletmsg.AppID}" data-miniprogram-path="${data.route}"   
          data-miniprogram-title="${data.title}" 
-          data-miniprogram-imageurl="http://mmbiz.qpic.cn/mmbiz_jpg/iamUJ3Ot9utFjb5RP6Fr0ECTbQDnicewkS38JbPCsoFZPUzibXuIj6IhaHOPudWSG0ZxldLIj70QtHVSbwrBaP85g/0?wx_fmt=jpeg" 
+          data-miniprogram-imageurl="${data.appletmsg.Image}" 
          data-miniprogram-type="card" data-miniprogram-servicetype="0"></mp-miniprogram><span data-time="${dataTime}"></span>`
          //自己看的写法
          html += '<p><iframe height="320" width="auto" data-time=' + dataTime + ' data-miniprogram-appid=' + data.appletmsg.AppID + ' frameborder="0"  allowtransparency="true" ' +