1

src/pages/teacher/components/chooseApplet.vue

@@ -68,7 +68,7 @@
 
         <!-- 选择文件 -->
         <q-dialog title="选择文件" v-model="getImgChoice" width="1200px">
-            <ChooseImg @SelectId="SelectId" :type="0" @closeDia="getImgChoice=false"></ChooseImg>
+            <ChooseImg @SelectId="SelectId" :type="ChooseImgtype" @closeDia="getImgChoice=false"></ChooseImg>
         </q-dialog>
 
     </div>
@@ -103,7 +103,8 @@
                     appletmsg: null
                 },
                 AppletList: [],
-                getImgChoice: false
+                getImgChoice: false,
+                ChooseImgtype:0
             }
         },
         created() {
@@ -147,6 +148,7 @@
             },
             SelectId(obj) {
                 this.msg.imgUrl = obj[0].ImageUrl
+                console.log(this.msg.imgUrl )
                 this.getImgChoice = false;
             },
             getroute(e) {//选择了小程序 路径赋值

src/pages/teacher/contribution/addimageText.vue

@@ -375,7 +375,6 @@
                 this.$refs.UE_cb.hyperlinks(data)
             },
             getcontnet(data, length) {
-                console.log(length)
                 if (this.addMsg.Type == 2) {
                     this.addMsg.Description = data
                 } else {
@@ -433,6 +432,8 @@
             },
             getapplet(){//小程序弹窗
                 this.getappletChoice = true
+                let a = "<mp-miniprogram data-miniprogram-appid=\"wxacd9f8cc3480d29e\" data-miniprogram-path=\"pages\/index\/index\" data-miniprogram-nickname=\"赞羊\" data-miniprogram-avatar=\"http:\/\/mmbiz.qpic.cn\/mmbiz_png\/vDPDsxyFvjJ09nKK5HDicbSibuyWIx8l7S3icxkc0kwtJApsYc1hicVSTxbCakhRAuMLpxGibmxH6MeC4kSibBwl3GSQ\/640?wx_fmt=png&amp;wxfrom=200\" data-miniprogram-title=\"飞哥地方给对方\" data-miniprogram-imageurl=\"http:\/\/mmbiz.qpic.cn\/mmbiz_jpg\/iamUJ3Ot9utFjb5RP6Fr0ECTbQDnicewkS38JbPCsoFZPUzibXuIj6IhaHOPudWSG0ZxldLIj70QtHVSbwrBaP85g\/0?wx_fmt=jpeg\" data-miniprogram-type=\"card\" data-miniprogram-servicetype=\"0\"><\/mp-miniprogram>"
+                console.log(a)
             },
             getresult(data){//选择小程序的结果
                 console.log(data)

src/pages/teacher/contribution/imageTextlist.vue

@@ -47,8 +47,23 @@
                             class="q-mr-xs" label="详情" @click="viewDetails(props.row)" /> -->
                         <q-btn flat size="xs" icon="edit" style="font-weight:400;color: #3FC4FF" class="q-mr-xs"
                             label="编辑" @click="goedit(props.row)" />
-                        <q-btn flat size="xs" icon="delete" color="negative" class="q-mr-xs" label="删除"
-                            @click="goDetailed(props.row)" />
+                       
+
+                            <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left: 10px">
+                                <q-list>
+                                  <q-item clickable v-close-popup @click="tijiaosh(props.row)">
+                                    <q-item-section v-if="props.row.AuditState==0">
+                                      <q-item-label>提交审核</q-item-label>
+                                    </q-item-section>
+                                  </q-item>
+                                  <q-item clickable v-close-popup @click="goDetailed(props.row)">
+                                    <q-item-section>
+                                      <q-item-label>删除</q-item-label>
+                                    </q-item-section>
+                                  </q-item>
+                                 
+                                </q-list>
+                              </q-btn-dropdown>
                     </q-td>
                 </template>
                 <template v-slot:bottom>
@@ -217,6 +232,29 @@
 
                 });
             },
+            tijiaosh(row){//提交审核
+                this.$q.dialog({
+                    title: '提示信息',
+                    message: '是否将素材提交审核？',
+                    cancel: true,
+                    persistent: true,
+                    ok: "确定",
+                    cancel: "取消",
+                }).onOk(() => {
+                    setContributeInfoState({ ContributeId: row.Id, Type: 1 }).then(res => {
+                        this.$q.notify({
+                            icon: 'iconfont icon-chenggong',
+                            color: 'accent',
+                            timeout: 2000,
+                            message: res.Message,
+                            position: 'top'
+                        })
+                        this.getList()
+                    })
+                }).onCancel(() => {
+
+                });
+            },
             goedit(row){//编辑
                 this.OpenNewUrl("/teacher/contribution/addimageText", {
                     type: row.Type,

src/pages/teacher/contribution/ue/contributionUE.vue

@@ -169,13 +169,17 @@
       applet(data){
         let html = '';
         if(data.type==1){//文字小程序
-          html +=   `<p><a data-miniprogram-appid="${data.appletmsg.AppID}" data-miniprogram-path="${data.appletmsg.Page}" href="">${data.title}</a></p>`;
+          html +=   `<p><a data-miniprogram-appid="${data.appletmsg.AppID}" data-miniprogram-path="${data.route}" href="">${data.title}</a></p>`;
 
         }else if(data.type==2){//图片小程序
-          html+=`<p><a data-miniprogram-appid="${data.appletmsg.AppID}" data-miniprogram-path="${data.appletmsg.Page}" href=""><img src="${data.imgUrl}" alt="" data-width="null" ></a></p>`
+          html+=`<p><a data-miniprogram-appid="${data.appletmsg.AppID}" data-miniprogram-path="${data.route}" href=""><img src="${data.imgUrl}" alt="" data-width="null" ></a></p>`
         }else if(data.type==3){
-          html+=`<mp-miniprogram data-miniprogram-appid="${data.appletmsg.AppID}" data-miniprogram-path="${data.appletmsg.Page}" data-miniprogram-title="${data.title}" data-miniprogram-imageurl="${data.imgUrl}"></mp-miniprogram>`
+          html+=`<mp-miniprogram data-miniprogram-appid="${data.appletmsg.AppID}" data-miniprogram-path="${data.route}" data-miniprogram-nickname="${data.appletmsg.Name}" data-miniprogram-avatar="${data.imgUrl}" data-miniprogram-title="${data.title}" data-miniprogram-imageurl="${data.imgUrl}" data-miniprogram-type="card" data-miniprogram-servicetype="0"></mp-miniprogram>`
+          let a=`<mp-miniprogram data-miniprogram-appid="wxacd9f8cc3480d29e" data-miniprogram-path="pages/index/index" data-miniprogram-nickname="赞羊" data-miniprogram-avatar="http://mmbiz.qpic.cn/mmbiz_png/vDPDsxyFvjJ09nKK5HDicbSibuyWIx8l7S3icxkc0kwtJApsYc1hicVSTxbCakhRAuMLpxGibmxH6MeC4kSibBwl3GSQ/640?wx_fmt=png&amp;wxfrom=200" data-miniprogram-title="飞哥地方给对方" data-miniprogram-imageurl="http://mmbiz.qpic.cn/mmbiz_jpg/iamUJ3Ot9utFjb5RP6Fr0ECTbQDnicewkS38JbPCsoFZPUzibXuIj6IhaHOPudWSG0ZxldLIj70QtHVSbwrBaP85g/0?wx_fmt=jpeg" data-miniprogram-type="card" data-miniprogram-servicetype="0"></mp-miniprogram>`
+          console.log(html)
+          console.log(a)
         }
+        
         if (html && html != '') {
             this.ue.execCommand('inserthtml', html);
           }