'最新'

杨鑫
1 parent 9816fbf6
Showing 20 changed files with 304 additions and 365 deletions
admin-web-master/src/views/activity/activityBian.vue
admin-web-master/src/views/activity/activityBz.vue
admin-web-master/src/views/activity/activitySp.vue
admin-web-master/src/views/activity/index.vue
admin-web-master/src/views/atmosphere/atmosphereBian.vue
admin-web-master/src/views/atmosphere/atmosphereBz.vue
admin-web-master/src/views/atmosphere/atmosphereGl.vue
admin-web-master/src/views/atmosphere/atmosphereSp.vue
admin-web-master/src/views/media/mediaMana.vue
admin-web-master/src/views/media/mediaMannaAdd.vue
admin-web-master/src/views/promotion/account.vue
admin-web-master/src/views/promotion/audit.vue
admin-web-master/src/views/promotion/contentMant.vue
admin-web-master/src/views/serve/MarkActivity/index.vue
admin-web-master/src/views/serve/procedure.vue
lvdao-miniapp/pages/my/my.vue
lvdao-miniapp/pages/saleReport/saleReport.vue
lvdao-miniapp/pages/salesReporting/salesReporting.vue
lvdao-miniapp/pages/salesSta/salesSta.vue
lvdao-miniapp/utils/request.js
@@ -81,9 +81,10 @@
             </el-row>
             <div style="padding: 10px">
               <el-row :gutter="20">
-                  <el-col :span="12">
+                  <el-col :span="24">
                     <el-form-item label="活动封面海报" prop="cover_poster" class="grid-content bg-purple">
-                      <upimg v-model="secondData.coverPoster" :value="secondData.coverPoster==''?'':secondData.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
+                      <upimg filePath="act" :value="secondData.coverPoster==''?'':secondData.coverPoster" inputtype="coverPoster" :limit="1" @changimg="e=>changimg(e,'coverPoster')"></upimg>
+                      <!-- <upimg v-model="secondData.coverPoster" :value="secondData.coverPoster==''?'':secondData.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg> -->
                     </el-form-item>
                      </el-col>
               </el-row>
@@ -245,14 +246,15 @@
             相关附件信息
           </div>
           <div>
-            <el-upload class="upload-demo" ref="upload"
+            <upfile filePath="act" inputtype="otherImageVideos" :islist="false" :accept="'.docx'" :value="ruleForm.otherImageVideos" @changimg="e=>changimg(e,'otherImageVideos')"></upfile>
+            <!-- <el-upload class="upload-demo" ref="upload"
             :action="uploadFileUrl"
             :on-success="handleUploadSuccess"
               :file-list="fileData" :show-file-list="false">
               <div style="color: #2d8a58;margin-left: 10px;margin-top: 10px;" slot="trigger">
                 上传附件
               </div>
-            </el-upload>
+            </el-upload> -->
           </div>
         </div>
         <div style="padding: 20px 40px 0px 20px">
@@ -338,6 +340,7 @@
   import Vue from 'vue'
   import { uploadUrl } from '@/utils/request'
   import upimg from "@/components/ImageUpload/index"
+  import upfile from "@/components/fujianUpload/fujianList"
    export default {
      props:{
        showBian:{
@@ -345,7 +348,7 @@
             default: () => ({})
        }
      },
-     components: { upimg},
+     components: { upimg,upfile},
       data() {
         return {
            uploadFileUrl: uploadUrl, // 请求地址
@@ -370,6 +373,7 @@
             estimatedCost:'',
             notes:''
           },
+          ruleForm:{}
         }
       },
@@ -391,6 +395,27 @@
         mounted() {
           },
        methods: {
+         changimg(e,type) {
+           this.ruleForm[type] = e
+
+           if(type=='otherImageVideos'){
+          const parts = e.split('/');
+          const filename = parts[parts.length - 1];
+             // let file ={
+             //   url:e,
+             //   attachmentName:filename
+             // }
+             let fuji={
+                            detailsId:this.secondData.id,
+                            attachmentName:filename,
+                            attachmentUrl:e,
+                          }
+                          fujiaAdd(fuji).then(res=>{
+             this.fucha(this.secondData.id)
+                          })
+             // this.dataList.push(file)
+           }
+         },
          //获取当前时间
           updateCurrentTime() {
                const now = new Date();
@@ -118,7 +118,7 @@
                     </el-col>
                   </el-row>
                   <el-row :gutter="20">
-                    <el-col :span="12">
+                    <el-col :span="24">
                       <el-form-item label="活动封面海报" prop="coverPoster" class="grid-content bg-purple">
                         <upimg filePath="act" :value="ruleForm.coverPoster" inputtype="coverPoster" :limit="1" @changimg="e=>changimg(e,'coverPoster')"></upimg>
                         <!-- <upimg v-model="ruleForm.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg> -->
@@ -279,9 +279,10 @@
         <el-tab-pane label="相关附件">
           <div style="border: 1px solid #E5E5E5;padding: 1px" id="fu">
             <div style="padding: 10px 13px;font-size: 12px;border-bottom: 1px solid #E5E5E5;display: flex;">
-              <div>相关附件</div>
+              <div style="line-height:38px;">相关附件</div>
               <div>
-                <upfile filePath="act" inputtype="otherImageVideos" :value="ruleForm.otherImageVideos" @changimg="e=>changimg(e,'otherImageVideos')"></upfile>
+                <upfile filePath="act" inputtype="otherImageVideos"  :limit="10" :islist="false" :accept="'.docx'" :value="ruleForm.otherImageVideos" @changimg="e=>changimg(e,'otherImageVideos')"></upfile>
+
                 <!-- <el-upload class="upload-demo" ref="upload" :on-preview="handlePreview" :on-remove="handleRemove"
                   :action="uploadFileUrl" :on-success="handleUploadSuccess" :file-list="fileData"
                   :show-file-list="false">
@@ -515,7 +516,16 @@ lishiList:&#39;&#39;,
     methods: {
       changimg(e,type) {
         this.ruleForm[type] = e
-        console.log(e)
+
+        if(type=='otherImageVideos'){
+       const parts = e.split('/');
+       const filename = parts[parts.length - 1];
+          let file ={
+            url:e,
+            name:filename
+          }
+          this.dataList.push(file)
+        }
       },
       //获取当前时间
       updateCurrentTime() {
@@ -551,7 +561,7 @@ lishiList:&#39;&#39;,
         this.$refs.upload.submit();
       },
       handleUploadSuccess(response, file, fileList) {
-        console.log(response, file, fileList)
+
         this.dataList.push(file)
       },
       handleRemove(file, fileList) {
@@ -685,7 +695,7 @@ lishiList:&#39;&#39;,
                 let fuji = {
                   detailsId: res.data.id,
                   attachmentName: this.dataList[i].name,
-                  attachmentUrl: this.dataList[i].response.data.url,
+                  attachmentUrl: this.dataList[i].url,
                 }
                 fujiaAdd(fuji).then(res => {
                   console.log('成功')
@@ -178,7 +178,7 @@
                                                  <div style="padding: 10px">
                                                    <el-row :gutter="20">
                                                      <el-form-item label="活动封面海报" prop="cover_poster" class="grid-content bg-purple">
-                                                        <img :src="secondData.coverPoster" alt="" style="width: 80px;height:80px;">
+                                                        <img :src="$baseURL+secondData.coverPoster" alt="" style="width: 80px;height:80px;">
                                                      </el-form-item>
                                                    </el-row>
                                                  </div>
@@ -510,7 +510,7 @@
         <div style="width: 100%;">
           <div style="display: flex;padding:0px 20px 20px 20px; ">
             <div style="width: 150px;height: 80px;" v-if="secondData.coverPoster">
-              <img :src="secondData.coverPoster" alt="" style="width: 100%;height: 80px;" />
+              <img :src="$baseURL+secondData.coverPoster" alt="" style="width: 100%;height: 80px;" />
             </div>
             <div
               style="display: flex;flex-direction: column;justify-content: space-around;padding: 0 10px;font-size: 12px;">
@@ -262,7 +262,7 @@
               <el-table-column label="操作" min-width="20%">
                 <template slot-scope="scope">
                   <!-- <div class="tableBtn greens" @click="Down(scope.row)">下载</div> -->
-                  <a class="tableBtn greens" :href="scope.row.attachmentUrl" target="_blank" download>下载</a>
+                  <a class="tableBtn greens" :href="$baseURL+scope.row.attachmentUrl" target="_blank" download>下载</a>
                 </template>
               </el-table-column>
@@ -489,7 +489,7 @@
                 </el-col>
               </el-row>
-              <el-row :gutter="20">
+              <!-- <el-row :gutter="20">
                 <el-col :span="24">
                   <el-form-item label="反馈内容" class="grid-content bg-purple" prop="name">
                    <el-upload class="upload-demo" ref="upload"  :on-remove="handleRemove"
@@ -501,7 +501,7 @@
                   </el-form-item>
                 </el-col>
-              </el-row>
+              </el-row> -->
             </el-form>
           </div>
         </div>
@@ -2230,9 +2230,6 @@
 ::v-deep .el-form-item{
   margin-bottom:16px;
 }
-  /deep/ .el-form-item__content {
-    line-height: 0;
-  }
   .tableBtn {
     display: inline-block;
@@ -79,9 +79,11 @@
             </el-row>
             <div style="padding: 10px">
               <el-row :gutter="20">
-                <el-form-item label="活动封面海报" prop="cover_poster" class="grid-content bg-purple">
-                  <upimg v-model="secondData.coverPoster" :value="secondData.coverPoster==''?'':secondData.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
+                <el-col :span="24">
+                <el-form-item label="活动封面海报" prop="coverPoster" class="grid-content bg-purple">
+                  <upimg filePath="act" :value="secondData.coverPoster==''?'':secondData.coverPoster" inputtype="coverPoster" :limit="1" @changimg="e=>changimg(e,'coverPoster')"></upimg>
                 </el-form-item>
+                   </el-col>
               </el-row>
             </div>
           </el-form>
@@ -238,14 +240,15 @@
             相关附件信息
           </div>
           <div>
-            <el-upload class="upload-demo" ref="upload"
+            <upfile filePath="act" inputtype="otherImageVideos" :islist="false" :accept="'.docx'" :value="ruleForm.otherImageVideos" @changimg="e=>changimg(e,'otherImageVideos')"></upfile>
+            <!-- <el-upload class="upload-demo" ref="upload"
             :action="uploadFileUrl"
             :on-success="handleUploadSuccess"
               :file-list="fileData" :show-file-list="false">
               <div style="color: #2d8a58;margin-left: 10px;margin-top: 10px;" slot="trigger">
                 上传附件
               </div>
-            </el-upload>
+            </el-upload> -->
           </div>
         </div>
         <div style="padding: 20px 40px 0px 20px">
@@ -330,6 +333,8 @@
   import Vue from 'vue'
   import { uploadUrl } from '@/utils/request'
   import upimg from "@/components/ImageUpload/index"
+  import upfile from "@/components/fujianUpload/fujianList"
+
    export default {
      props:{
        showBian:{
@@ -337,7 +342,7 @@
             default: () => ({})
        }
      },
-      components: { upimg},
+      components: { upfile,upimg},
       data() {
         return {
           uploadFileUrl: uploadUrl, // 请求地址
@@ -383,6 +388,27 @@
         mounted() {
           },
        methods: {
+         changimg(e,type) {
+           this.ruleForm[type] = e
+
+           if(type=='otherImageVideos'){
+          const parts = e.split('/');
+          const filename = parts[parts.length - 1];
+             // let file ={
+             //   url:e,
+             //   attachmentName:filename
+             // }
+             let fuji={
+                            detailsId:this.secondData.id,
+                            attachmentName:filename,
+                            attachmentUrl:e,
+                          }
+                          fujiaAdd(fuji).then(res=>{
+             this.fucha(this.secondData.id)
+                          })
+             // this.dataList.push(file)
+           }
+         },
          //获取当前时间
           updateCurrentTime() {
                const now = new Date();
@@ -118,9 +118,9 @@
                   </el-col>
                 </el-row>
                       <el-row :gutter="20">
-                        <el-col :span="12">
-                                                <el-form-item label="活动封面海报" prop="cover_poster" class="grid-content bg-purple">
-                                                  <upimg v-model="ruleForm.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
+                        <el-col :span="24">
+                                                <el-form-item label="活动封面海报" prop="coverPoster" class="grid-content bg-purple">
+                                                  <upimg filePath="act" :value="ruleForm.coverPoster" inputtype="coverPoster" :limit="1" @changimg="e=>changimg(e,'coverPoster')"></upimg>
                                                 </el-form-item>
                                                  </el-col>
                       </el-row>
@@ -282,17 +282,9 @@
             <el-tab-pane label="相关附件">
               <div style="border: 1px solid #E5E5E5;padding: 1px" id="fu">
                 <div style="padding: 10px 13px;font-size: 12px;border-bottom: 1px solid #E5E5E5;display: flex;">
-                <div>相关附件</div>
+                <div style="line-height:38px;">相关附件</div>
                 <div>
-                  <el-upload class="upload-demo" ref="upload"
-                  :action="uploadFileUrl"
-                  :on-success="handleUploadSuccess"
-                   :file-list="fileData"
-                   :show-file-list="false" >
-                    <div style="color: #2d8a58;margin-left: 10px;" slot="trigger">
-                      上传附件
-                    </div>
-                  </el-upload>
+                  <upfile filePath="act" inputtype="otherImageVideos"  :limit="10" :islist="false" :accept="'.docx'" :value="ruleForm.otherImageVideos" @changimg="e=>changimg(e,'otherImageVideos')"></upfile>
                 </div>
                 </div>
                 <div style="padding: 15px;">
@@ -391,6 +383,7 @@
   import { uploadUrl } from '@/utils/request'
   import html2canvas from 'html2canvas'
   import jsPDF from 'jspdf'
+  import upfile from "@/components/fujianUpload/fujianList"
 export default {
   props: {
     showAdd:{
@@ -404,7 +397,7 @@ export default {
                   },
     }
   },
-  components: { wangEditor ,upimg},
+  components: { wangEditor ,upimg,upfile},
   data(){
     return{
 uploadFileUrl: uploadUrl, // 请求地址
@@ -476,6 +469,19 @@ lishiList:&#39;&#39;,
       this.lishi()
   },
   methods: {
+    changimg(e,type) {
+      this.ruleForm[type] = e
+
+      if(type=='otherImageVideos'){
+     const parts = e.split('/');
+     const filename = parts[parts.length - 1];
+        let file ={
+          url:e,
+          name:filename
+        }
+        this.dataList.push(file)
+      }
+    },
     //获取当前时间
      updateCurrentTime() {
           const now = new Date();
@@ -139,7 +139,7 @@
             <div style="width: 100%;">
               <div style="display: flex;padding:0px 20px 20px 20px; ">
                 <div style="width: 150px;height: 80px;" v-if="secondData.coverPoster">
-                  <img :src="secondData.coverPoster" alt="" style="width: 100%;height: 80px;"/>
+                  <img :src="$baseURL+secondData.coverPoster" alt="" style="width: 100%;height: 80px;"/>
                 </div>
                 <div
                   style="display: flex;flex-direction: column;justify-content: space-around;padding: 0 10px;font-size: 12px;">
@@ -553,7 +553,7 @@
                         </el-col>
                       </el-row>
-                      <el-row :gutter="20">
+                      <!-- <el-row :gutter="20">
                         <el-col :span="24">
                           <el-form-item label="反馈内容" class="grid-content bg-purple" prop="name">
                            <el-upload class="upload-demo" ref="upload"  :on-remove="handleRemove"
@@ -565,7 +565,7 @@
                           </el-form-item>
                         </el-col>
-                      </el-row>
+                      </el-row> -->
                     </el-form>
                   </div>
                 </div>
@@ -2216,9 +2216,6 @@ this.fileData=[]
   }
-/deep/ .el-form-item__content {
-  line-height: 0;
-}
 .tableBtn {
   display: inline-block;
@@ -430,7 +430,7 @@
                                                  <div style="padding: 10px">
                                                    <el-row :gutter="20">
                                                      <el-form-item label="活动封面海报" prop="cover_poster" class="grid-content bg-purple">
-                                                        <img :src="secondData.coverPoster" alt="" style="width: 80px;height:80px;">
+                                                        <img :src="$baseURL+secondData.coverPoster" alt="" style="width: 80px;height:80px;">
                                                      </el-form-item>
                                                    </el-row>
                                                  </div>
@@ -761,7 +761,7 @@
         <div style="width: 100%;">
           <div style="display: flex;padding:0px 20px 20px 20px; ">
             <div style="width: 150px;height: 80px;" v-if="secondData.coverPoster">
-              <img :src="secondData.coverPoster" alt="" style="width: 100%;height: 80px;"/>
+              <img :src="$baseURL+secondData.coverPoster" alt="" style="width: 100%;height: 80px;"/>
             </div>
             <div
               style="display: flex;flex-direction: column;justify-content: space-around;padding: 0 10px;font-size: 12px;">
@@ -126,8 +126,8 @@
                       </el-form-item>
                       <el-form-item label="封面海报" class="grid-content bg-purple" prop="name">
                         <div style="margin:0 10px;">
-                          <upimg v-model="secondData.coverImage" :value="secondData.coverImage"  :limit="1"  :fileSize="1"  :isShowTip="false"  v-if="wangShow==false"></upimg>
-                          <img :src="secondData.coverImage" alt="" style="width:150px;height: 150px;" v-if="wangShow"/>
+     <upimg filePath="tuiguang" :value="secondData.coverImage" inputtype="coverImage" :limit="1" v-if="wangShow==false" @changimg="e=>changimg(e,'coverImage')"></upimg>
+                          <img :src="$baseURL+secondData.coverImage" alt="" style="width:150px;height: 150px;" v-if="wangShow"/>
                           </div>
                       </el-form-item>
                       <el-form-item label="宣传内容" class="grid-content bg-purple" prop="name">
@@ -531,7 +531,7 @@ components: { addAct,wangEditor,upimg},
         planName: '',
         planFen:'',
         currentPage: 1,
-        total: 100,
+        total: 0,
         flag: false,
         pageSize: 10,
         ggXin: false,
@@ -602,6 +602,10 @@ components: { addAct,wangEditor,upimg},
     },
     methods: {
+      changimg(e,type) {
+        this.secondData[type] = e
+
+      },
       //查询全数据
       async getAll() {
         const res = await tuiGetAll(this.pageindex)
@@ -44,19 +44,20 @@
               <div style="padding:15px">
                   <div style="display:flex;">
                      <div style="display:flex;margin-right:30px;">
-                       <div>微信</div>
-                     <div style="margin:0 10px;"><upimg v-model="ruleForm.coverImage" :limit="1" :fileSize="1" :isShowTip="false"></upimg></div>
-                       <div style="color:#E5E5E5">
-                            请选择海报
-                        </div>
+                       <div>封面海报</div>
+                     <div style="margin:0 10px;">
+                       <!-- <upimg v-model="ruleForm.coverImage" :limit="1" :fileSize="1" :isShowTip="false"></upimg> -->
+                            <upimg filePath="tuiguang" :value="ruleForm.coverImage" inputtype="coverImage" :limit="1" @changimg="e=>changimg(e,'coverImage')"></upimg>
+                       </div>
+
                      </div>
-                     <div style="display:flex">
+                     <!-- <div style="display:flex">
                        <div>微信朋友圈</div>
                      <div style="margin:0 10px;"><upimg v-model="ruleForm.wxpyPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg></div>
                        <div style="color:#E5E5E5">
                             请选择海报
                         </div>
-                     </div>
+                     </div> -->
                   </div>
               </div>
             </div>
@@ -69,10 +70,10 @@
         </el-button>
         <!-- <el-button plain @click="close" size="mini" style="background-color: #3F9B6A;color: #fff;">发布信息填写
         </el-button> -->
-        <el-button plain @click="close" size="mini" style="background-color: #3F9B6A;color: #fff;">媒体上传
+     <!--   <el-button plain @click="close" size="mini" style="background-color: #3F9B6A;color: #fff;">媒体上传
         </el-button>
         <el-button plain @click="close" size="mini" style="background-color: #fff;color: #000;border:1px solid #A0A0A0" class="buttonHover">一键发布
-        </el-button>
+        </el-button> -->
         <el-button plain @click="close" size="mini" style="background-color: #fff;color: #000;border:1px solid #A0A0A0" class="buttonHover">返回
         </el-button>
       </div>
@@ -147,6 +148,10 @@
              this.editTrue = true
           },
         methods: {
+          changimg(e,type) {
+            this.ruleForm[type] = e
+
+          },
           //获取当前时间
            updateCurrentTime() {
                 const now = new Date();
@@ -139,7 +139,8 @@
               <el-input v-model="formInline.appKey"  placeholder="请输入"></el-input>
             </el-form-item>
             <el-form-item label="APP图片" v-if="index==1?true:false" prop="coverPoster" style="margin-bottom:20px;">
-              <upimg v-model="formInline.coverPoster" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
+          <upimg filePath="qudao" :value="formInline.coverPoster" inputtype="coverPoster" :limit="1" @changimg="e=>changimg(e,'coverPoster')"></upimg>
+
             </el-form-item>
             <el-form-item label="备注">
               <el-input type="textarea" v-model="formInline.notes" :rows="4"
@@ -297,6 +298,9 @@
       this.getAll()
     },
     methods: {
+      changimg(e,type) {
+        this.formInline[type] = e
+      },
       async getAll() {
         const res = await quGetAll(this.pageindex)
         this.tableData = res.data.content
@@ -45,9 +45,7 @@
                               </el-table-column>
                               <el-table-column label="类型" prop="promotionContent" min-width="150" >
                               </el-table-column>
-                              <el-table-column label="发布状态" prop="" min-width="80" >
-                              </el-table-column>
                               <el-table-column label="审批状态" prop="state" min-width="150" >
               <template slot-scope="scope">
                                  {{scope.row.state == ''?'待提交':scope.row.state == '1'?'待审批':scope.row.state == '2'?'部门领导审批':scope.row.state == '3'?'公司领导审批':scope.row.state == '4'?'其他审批':scope.row.state == '5'?'审核通过':'已驳回'}}
@@ -55,9 +53,7 @@
                               </el-table-column>
                               <el-table-column label="修改时间" prop="createDate" min-width="250"  >
                               </el-table-column>
-                              <el-table-column prop="eventEndTime" label="上传人员" min-width="120" >
-                              </el-table-column>
                 <el-table-column label="操作" min-width="150">
                   <template slot-scope="scope">
                     <div @click="actSp(scope.row)" class="tableBtn greens" v-if="scope.row.state != ''">OA流程审批</div>
@@ -76,148 +72,6 @@
           </div>
         </div>
-        <!-- 活动效果分析 -->
-        <el-dialog  :visible.sync="ggXin" custom-class='fenxi_css' style="padding: 0;" width="75%"
-                  center :close-on-click-modal="false" :close-on-press-escape="false">
-                  <div style="padding:15px;background-color:#F9F9F9;font-size:12px;border:1px solid #ECECEC;margin-bottom:20px">
-                      渠道效果分析
-                  </div>
-                  <div style="padding:0 20px;">
-                    <div style="font-size:12px;margin-bottom:10px;">成本分析</div>
-                        <div style="display:flex;padding:10px 0;">
-                            <div style="margin-right:40px;width:17%">
-                              <div style="color:#BBBBBB;font-size:10px;">吸引游客流量</div>
-                              <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">4289</span>人</div>
-                              <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">+45%</div>
-                              <div style="height:5px;background-color:red;"></div>
-                            </div>
-                            <div style="margin-right:40px;width:17%">
-                              <div style="color:#BBBBBB;font-size:10px;">参与人数</div>
-                              <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">4289</span>人</div>
-                              <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">+45%</div>
-                              <div style="height:5px;background-color:red;"></div>
-                            </div>
-                            <div style="margin-right:40px;width:17%">
-                              <div style="color:#BBBBBB;font-size:10px;">直接收益</div>
-                              <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">4289</span>人</div>
-                              <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">+45%</div>
-                              <div style="height:5px;background-color:red;"></div>
-                            </div>
-                            <div style="margin-right:40px;width:17%">
-                              <div style="color:#BBBBBB;font-size:10px;">间接收益</div>
-                              <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">4289</span>人</div>
-                              <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">+45%</div>
-                              <div style="height:5px;background-color:red;"></div>
-                            </div>
-                            <div style="margin-right:40px;width:17%">
-                              <div style="color:#BBBBBB;font-size:10px;">投入生产比</div>
-                              <div style="font-size:14px;padding:10px 0"><span style="font-size:20px;font-weight:600;">4289</span>人</div>
-                              <div style="color:#BBBBBB;font-size:10px;margin-bottom:10px">+45%</div>
-                              <div style="height:5px;background-color:red;"></div>
-                            </div>
-                        </div>
-                  </div>
-                  <div style="padding:15px;background-color:#F9F9F9;font-size:12px;border:1px solid #ECECEC;margin-bottom:20px">
-                      策划主题占比
-                  </div>
-                  <div style="padding:0 20px;display:flex;justify-content: space-around;color:#999999">
-                      <div style="display:flex;width:24%;align-items: center">
-                        <el-progress type="circle" :percentage="100"></el-progress>
-                        <div style="margin-left:30px;">
-                          <div style="margin-bottom: 15px;">主题1</div>
-                          <div><span style="font-size:26px;">53.2</span>万流量</div>
-                        </div>
-                      </div>
-                      <div style="display:flex;width:24%;align-items: center">
-                        <el-progress type="circle" :percentage="25"></el-progress>
-                        <div style="margin-left:30px;">
-                          <div style="margin-bottom: 15px;">主题2</div>
-                          <div><span style="font-size:26px;">53.2</span>万流量</div>
-                        </div>
-                      </div>
-                      <div style="display:flex;width:24%;align-items: center">
-                        <el-progress type="circle" :percentage="50"></el-progress>
-                        <div style="margin-left:30px;">
-                          <div style="margin-bottom: 15px;">主题3</div>
-                          <div><span style="font-size:26px;">53.2</span>万流量</div>
-                        </div>
-                      </div>
-                      <div style="display:flex;width:24%;align-items: center">
-                        <el-progress type="circle" :percentage="75"></el-progress>
-                        <div style="margin-left:30px;">
-                          <div style="margin-bottom: 15px;">主题4</div>
-                          <div><span style="font-size:26px;">53.2</span>万流量</div>
-                        </div>
-                      </div>
-                  </div>
-                    <div style="padding:0 20px;margin-top:20px;">
-                      <div style="padding:55px 10px 10px 10px;background-color:#fff;position:relative">
-                        <div style="position: absolute;top: 60px;right: 10px; z-index: 10;">
-                           <el-radio-group v-model="radio1"  style="margin-right:10px">
-                                <el-radio-button label="本周"></el-radio-button>
-                                <el-radio-button label="本月"></el-radio-button>
-                                <el-radio-button label="今年 "></el-radio-button>
-                                <el-radio-button label="自定义"></el-radio-button>
-                              </el-radio-group>
-                              <el-date-picker
-                                  v-if="radio1=='自定义'"
-
-                                    style="width:250px"
-                                    v-model="radio1_time"
-                                    type="datetimerange"
-                                    range-separator="至"
-                                    start-placeholder="开始日期"
-                                    end-placeholder="结束日期">
-                                  </el-date-picker>
-                        </div>
-                              <el-tabs type="border-card"  @tab-click="TabClick">
-                                <el-tab-pane label="整体效果分析">
-                                  <el-table :data="dataList"
-                                    :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
-                                    style="width: 100%">
-                                    <el-table-column label="渠道" width="auto" min-width="12%"  align="center">
-                                      <template slot-scope="scope">
-                                        {{scope.$index + 1}}
-                                            </template>
-                                    </el-table-column>
-                                    <el-table-column label="阅读量" width="auto" min-width="15%"  align="center">
-                                      <template slot-scope="scope">
-                                        {{scope.$index + 1}}
-                                            </template>
-                                    </el-table-column>
-                                    <el-table-column label="点赞量" width="auto" min-width="15%"  align="center">
-                                      <template slot-scope="scope">
-                                        {{scope.$index + 1}}
-                                            </template>
-                                    </el-table-column>
-                                    <el-table-column label="评论量" prop="name" width="auto" min-width="15%">
-                                      <template slot-scope="scope">
-                                        {{scope.row.name}}
-                                            </template>
-                                    </el-table-column>
-                                    <el-table-column label="播放量" prop="name" width="auto" min-width="15%">
-                                      <template slot-scope="scope">
-                                        {{scope.row.name}}
-                                            </template>
-                                    </el-table-column>
-                                    <el-table-column label="回访人数" prop="name" width="auto" min-width="15%">
-                                      <template slot-scope="scope">
-                                        {{scope.row.name}}
-                                            </template>
-                                    </el-table-column>
-                                  </el-table>
-                                  </el-tab-pane>
-                                <el-tab-pane label="纵向分析">
-
-                                </el-tab-pane>
-                                <el-tab-pane label="横向分析">
-
-                                </el-tab-pane>
-                              </el-tabs>
-                        </div>
-
-                  </div>
-                </el-dialog>
       </div>
     </div>
       <!-- 审批 -->
@@ -285,7 +139,7 @@
                                                <el-col :span="8">
                                                  <el-form-item label="封面海报" class="grid-content bg-purple" prop="name">
                                                    <div style="margin:0 10px;">
-                                                     <img :src="secondData.coverImage" alt="" style="width:150px;height: 150px;" />
+                                                     <img :src="$baseURL+secondData.coverImage" alt="" style="width:150px;height: 150px;" />
                                                      </div>
                                                  </el-form-item>
                                                </el-col>
@@ -797,7 +651,7 @@ actSp(item){
     line-height: 0;
   }
-  
+
   .formSearch {
     display: flex;
@@ -97,11 +97,12 @@
             <div style="padding:20px;" v-if="index == 2" v-html="formInline.contentCompilation"></div>
             </el-form-item>
             <el-form-item label="附件上传"  prop="accountNumber">
-            <el-upload class="upload-demo" ref="upload"  :on-remove="handleRemove"
+            <!-- <el-upload class="upload-demo" ref="upload"  :on-remove="handleRemove"
                               :action="uploadFileUrl" :on-success="handleUploadSuccess" :file-list="fileData"
                                :auto-upload="true" v-if="index ==3 || index ==1">
                               <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;"  class="buttonHover" v-if="fileData.length==0">+点击上传</el-button>
-                            </el-upload>
+                            </el-upload> -->
+                            <upfile filePath="tuiguang" inputtype="otherImageVideos"  :limit="1"  :accept="'.docx'" :value="formInline.otherImageVideos" @changimg="e=>changimg(e,'otherImageVideos')"></upfile>
                             <div  style="padding:20px;"  v-if="index == 2">
                                     {{formInline.attachmentUpload[0]&&formInline.attachmentUpload[0].name?formInline.attachmentUpload[0].name:''}}
                             </div>
@@ -119,7 +120,8 @@
               <el-input v-model="formInline.appKey"  placeholder="请输入"></el-input>
             </el-form-item>
             <el-form-item label="APP图片" v-if="index==1?true:false" prop="appImage" style="margin-bottom:20px;">
-              <upimg v-model="formInline.appImage" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
+              <!-- <upimg v-model="formInline.appImage" :limit="1" :fileSize="1" :isShowTip="false"></upimg> -->
+               <upimg filePath="tuiguang" :value="formInline.appImage" inputtype="appImage" :limit="1" @changimg="e=>changimg(e,'appImage')"></upimg>
             </el-form-item>
             <el-form-item label="备注">
               <el-input type="textarea" v-model="formInline.remarks" :rows="4"
@@ -163,11 +165,12 @@
   } from '@/api/contentMant.js'
   import upimg from "@/components/ImageUpload/index"
   import wangEditor from "@/components/editor/index"
+  import upfile from "@/components/fujianUpload/fujianList"
   import {
     uploadUrl
   } from '@/utils/request'
   export default {
-    components: { upimg,wangEditor},
+    components: { upimg,wangEditor,upfile},
     data() {
       return {
         uploadFileUrl: uploadUrl, // 请求地址
@@ -234,6 +237,18 @@
       this.getAll()
     },
     methods: {
+      changimg(e,type) {
+        this.formInline[type] = e
+  if(type=='otherImageVideos'){
+     const parts = e.split('/');
+     const filename = parts[parts.length - 1];
+        let file ={
+          url:e,
+          name:filename
+        }
+      this.formInline.attachmentUpload =  JSON.stringify(this.file)
+      }
+      },
       async getAll() {
         const res = await quGetAll(this.pageindex)
         this.qudaoData = res.data.content
@@ -283,19 +298,19 @@
         this.$refs.jibenFrom.validate((valid) => {
             if (valid) {
               if(index == 1){
-                if(this.fileData.length !='0'){
-                   this.formInline.attachmentUpload = JSON.stringify(this.fileData)
-                }
+                // if(this.fileData.length !='0'){
+                //    this.formInline.attachmentUpload = JSON.stringify(this.fileData)
+                // }
                 this.formInline.createDate = this.updateCurrentTime()
                 contentAdd(this.formInline).then(res => {
                   this.getAll()
                   this.ggXin = false
                 })
               }else{
-                if(this.fileData.length !='0'){
-                   this.formInline.attachmentUpload = JSON.stringify(this.fileData)
+                // if(this.fileData.length !='0'){
+                //    this.formInline.attachmentUpload = JSON.stringify(this.fileData)
-                }
+                // }
                 contentEdit(this.formInline).then(res => {
                   this.getAll()
                   this.ggXin = false
@@ -445,7 +460,7 @@
     line-height: 0;
   }
-  
+
   .formSearch {
     display: flex;
@@ -155,7 +155,8 @@
                    <el-input placeholder="请输入"  v-model="xiangData.contactPhone"  :disabled="edit"></el-input>
                  </el-form-item>
                  <el-form-item label="封面图片" prop="coverImage">
-                   <upimg v-model="xiangData.coverImage" :limit="1" :fileSize="1" :isShowTip="false" v-if="!edit"></upimg>
+                   <!-- <upimg v-model="xiangData.coverImage" :limit="1" :fileSize="1" :isShowTip="false" v-if="!edit"></upimg> -->
+                   <upimg filePath="serve" :value="xiangData.coverImage" inputtype="coverImage" :limit="1" v-if="!edit" @changimg="e=>changimg(e,'coverImage')"></upimg>
                    <img :src="xiangData.coverImage" alt="" v-else>
                  </el-form-item>
@@ -238,7 +239,8 @@
           <el-input placeholder="请输入"  v-model="formInline.contactPhone" ></el-input>
         </el-form-item>
         <el-form-item label="封面图片">
-          <upimg v-model="formInline.coverImage" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
+          <!-- <upimg v-model="formInline.coverImage" :limit="1" :fileSize="1" :isShowTip="false"></upimg> -->
+          <upimg filePath="serve" :value="formInline.coverImage" inputtype="coverImage" :limit="1" v-if="!edit" @changimg="e=>changimg(e,'coverImage')"></upimg>
         </el-form-item>
       </el-form>
@@ -430,6 +432,10 @@
     },
     methods: {
+      changimg(e,type) {
+        this.xiangData[type] = e
+      this.changimg[type] = e
+      },
       // 获取时间
       currentTime() {
         let date = new Date();
@@ -244,15 +244,15 @@
                 @click="closeFn(1)"
                 >取消</el-button
               >
-              <el-button
+              <!-- <el-button
               style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
                 @click="bianji"
-                >编辑</el-button
-              >
+                >编辑</el-button> -->
               <el-button
                style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
                 @click="msgeditS"
+                v-if="!edit"
                 >确定</el-button
               >
             </div>
@@ -301,7 +301,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="公告内容">
-                <div style="border: 1px solid #ccc">
+                <div>
                   <wang-editor v-model="ruleForm.announcementContent" ref="editor"></wang-editor>
                 </div>
@@ -222,21 +222,7 @@
 						<image :src="$imgUrl('/right2.png')"></image>
 					</view>
 				</view>
-				<!-- <view class="list" @click="handleApplySettle">
-					<view class="icon-data">
-						<view class="icon">
-							<image :src="$imgUrl('/my-icon4.png')" mode=""></image>
-						</view>
-						<view class="data">
-							<view class="title">
-								<text>商城入驻申请</text>
-							</view>
-						</view>
-					</view>
-					<view class="more">
-						<image :src="$imgUrl('/right2.png')"></image>
-					</view>
-				</view> -->
+			
 			</view>
 		</view>
 		<!-- tabbar -->
@@ -455,44 +441,7 @@
 				}
 			},
-			handleApplySettle() {
-				// uni.navigateTo({
-				// 	url: '/pages/myzili/myzili'
-				// })
-				const res = uni.getStorageSync('token');
-				let token = Encrypt(res)
-				let username = this.shopMsg.shopName
-				// let url = 'http://8.130.38.56:8027/settled-merchant'
-				let url = 'https://jy.scjysm.asia:18086/settled-merchant'
-
-				// #ifdef H5
-				console.log('h5 test')
-				window.location.href = url + `/#/?username=${ username }&user=${ token }`
-				// #endif
-				// #ifdef APP-PLUS
-				plus.runtime.openURL(url + `/#/?username=${ username }&user=${ token }`, function(
-					e) {
-					console.log(e);
-				})
-				// #endif
-				// #ifdef MP-WEIXIN
-				uni.navigateTo({
-					url: `../linkOthers/index?url=${ url }&username=${ username }&user=${ token }`
-					// 此处的链接为小程序上面新建的webview页面路径，参数url为要跳转外链的地址
-					// url: '../../../pages_category_page1/linkOthers/index?url=' + encodeURIComponent(url)
-					// url:'../../../pages_category_page2/userModule/coupon'
-				})
-				// #endif
-				// #ifdef MP-ALIPAY
-				uni.navigateTo({
-					url: `../linkOthers/index?url=${ url }&username=${ username }&user=${ token }`
-					// 此处的链接为小程序上面新建的webview页面路径，参数url为要跳转外链的地址
-					// url: '../../../pages_category_page1/linkOthers/index?url=' + encodeURIComponent(url)
-					// url:'../../../pages_category_page2/userModule/coupon'
-				})
-				// #endif
-
-			},
+			
 			myMsg() {
 				const res = uni.getStorageSync('token');
 				if (res == '') {
@@ -32,7 +32,7 @@
 				<view class="up_line"></view>
 				<view class="item">
 					<view class="title">
-						价格
+						单价
 					</view>
 					<view class="inputContent">
 						<input type="text" v-model="item.price" placeholder="请输入" />
@@ -10,8 +10,8 @@
 							<view class="title" style="font-size: 26rpx;">
 								今日销售金额
 							</view>
-							<view class="num">21</view>
-							<view>同比昨日上升5</view>
+							<view class="num">{{todayRe}}</view>
+							<view>同比昨日<span>{{subtract}}</span></view>
 						</view>
 						<!-- <view class="cardOne">
 							<view class="title">
@@ -25,7 +25,7 @@
 			</view>
 			<view class="" style="width: 96%;margin: 0 auto;background-color: #fff;border-radius: 20rpx;margin-top: 20rpx;">
 				<view class="" style="width: 96%;margin: 0 auto;padding: 20rpx 20rpx;">
-					<view style="font-weight: bold;font-size: 28rpx;">营业额趋势</view>
+					<view style="font-weight: bold;font-size: 28rpx;">营业额趋势(周)</view>
 					<view style="height: 300px;width: 100%;margin-top: 20rpx;">
 						<qiun-data-charts type="line" :opts="opts" :chartData="chartData" />
 					</view>
@@ -51,32 +51,33 @@
 			return {
 				chart: null,
 				chartData: {},
+				todayRe:0,
+				subtract:0,
 				opts: {
-					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
-						"#ea7ccc"
-					],
-					padding: [15, 10, 0, 15],
-					enableScroll: false,
-					legend: {},
-					xAxis: {
-						disableGrid: true
-					},
-					yAxis: {
-						gridType: "dash",
-						dashLength: 2
-					},
-					extra: {
-						line: {
-							type: "straight",
-							width: 2,
-							activeType: "hollow"
-						}
-					}
-				},
+		     color: ["#3CA272"],
+		           padding: [15,10,0,15],
+		           enableScroll: false,
+		           legend: {},
+		           xAxis: {
+		             disableGrid: true,
+					  fontSize: 10, // 设置X轴字体大小
+		           },
+		           yAxis: {
+		             gridType: "dash",
+		             dashLength: 2
+		           },
+		           extra: {
+		             line: {
+		               type: "curve",
+		               width: 2,
+		               activeType: "hollow"
+		             }
+		           }
+		     
+	   },
 				chartData1: {},
 				opts1: {
-					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
-						"#ea7ccc"
+					color: ["#3CA272"
 					],
 					padding: [15, 30, 0, 5],
 					enableScroll: false,
@@ -86,9 +87,12 @@
 						disableGrid: false,
 						min: 0,
 						axisLine: false,
-						max: 70
+				AllyDecimals: false,
+
+					},
+					yAxis: {
+						
 					},
-					yAxis: {},
 					extra: {
 						bar: {
 							type: "stack",
@@ -111,44 +115,79 @@
 		},
 		methods: {
 			getServerData() {
-				//模拟从服务器获取数据时的延时
-				setTimeout(() => {
-					//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
-					let res = {
-						categories: ["2020", "2021", "2022", "2023", "2024", "2025"],
-						series: [{
-								name: "成交量A",
-								data: [0, 0, 0, 0, 4,0]
-							},
-							{
-								name: "成交量B",
-								data: [0,0 ,0, 0, 44, 0]
-							},
-							{
-								name: "成交量C",
-								data: [0, 0, 0, 0, 112, 0]
-							}
-						]
-					};
-					this.chartData = JSON.parse(JSON.stringify(res));
-				}, 500);
-
-				setTimeout(() => {
-					//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
-					let res = {
-						categories: ["2020", "2021", "2022", "2023", "2024", "2025"],
-						series: [{
-								name: "目标值",
-								data: [0, 0, 0,0 ,13, 0]
-							},
-							{
-								name: "完成量",
-								data: [0, 0, 0, 0, 6, 0]
-							}
-						]
-					};
-					this.chartData1 = JSON.parse(JSON.stringify(res));
-				}, 500);
+				this.$http.sendRequest('/cereSalesReporting/salesStatistics/154', 'GET',{},1).then(res => {
+				  console.log(res.data)
+				  this.subtract = res.data.data.subtract	
+				  this.todayRe = res.data.data.todayRe	
+				  let salesRankingCate = []
+				  let salesRankingSeries =[]
+				   res.data.data.salesRanking.map(item=>{
+					   salesRankingCate.push(item.productName)
+					   salesRankingSeries.push(item.salesQuantity)
+				   })
+				  let objList = {
+				  	categories:salesRankingCate,
+				  	series: [{
+				  			name: "数量",
+				  			data: salesRankingSeries,
+				  		}
+				  	]
+				  }
+				  
+				  let turnoverDetailSeries =[]
+				  let objMsg ={
+				  						  name:'销售额',
+				  						  data:[0,0,0,0,0,0,0]
+				  }
+				  res.data.data.sameDaySalesVOS.map(item=>{
+					
+					
+					if(this.getWeekday(item.saleTime) == '周一'){
+						objMsg.data[0] = item.price 
+					}else if(this.getWeekday(item.saleTime) == '周二'){
+						objMsg.data[1] = item.price 
+					}else if(this.getWeekday(item.saleTime) == '周三'){
+						objMsg.data[2] = item.price 
+					}else if(this.getWeekday(item.saleTime) == '周四'){
+						objMsg.data[3] = item.price 
+					}else if(this.getWeekday(item.saleTime) == '周五'){
+						objMsg.data[4] = item.price 
+					}else if(this.getWeekday(item.saleTime) == '周六'){
+						objMsg.data[5] = item.price 
+					}else if(this.getWeekday(item.saleTime) == '周天'){
+						objMsg.data[6] = item.price 
+					}
+				
+				  					   
+				  })
+				  turnoverDetailSeries.push(objMsg)
+				  this.chartData1 = JSON.parse(JSON.stringify(objList))
+				  let qushi = {
+				  	categories: ["周一", "周二", "周三", "周四", "周五", "周六","周天"],
+				  	series: turnoverDetailSeries
+				  }
+				  this.chartData = JSON.parse(JSON.stringify(qushi))
+				  
+				})
+		
+			
+			},
+			getWeekday(dateString) {
+			    // 解析日期字符串
+			    const date = new Date(dateString)
+			    
+			    // 检查日期是否有效
+			    if (isNaN(date)) {
+			        throw new Error('无效的日期格式。请使用 "YYYY-M-D" 或 "YYYY-MM-DD" 格式。')
+			    }
+			
+			    // 定义星期的中文表示
+			    const weekdays = ["周一", "周二", "周三", "周四", "周五", "周六","周天"]
+			
+			    // 获取星期几（0-6）
+			    const dayIndex = date.getDay()
+			
+			    return weekdays[dayIndex]
 			},
 			// 跳转到销售上报页面
 			toSaleReport(){
@@ -47,25 +47,26 @@
  chart: null,
  chartData: {},
        opts: {
-         color: ["#1890FF","#91CB74","#FAC858","#EE6666","#73C0DE","#3CA272","#FC8452","#9A60B4","#ea7ccc"],
-         padding: [15,10,0,15],
-         enableScroll: false,
-         legend: {},
-         xAxis: {
-           disableGrid: true
-         },
-         yAxis: {
-           gridType: "dash",
-           dashLength: 2
-         },
-         extra: {
-           line: {
-             type: "straight",
-             width: 2,
-             activeType: "hollow"
-           }
-         }
-       },
+		     color: ["#1890FF","#91CB74","#FAC858","#EE6666","#73C0DE","#3CA272","#FC8452","#9A60B4","#ea7ccc"],
+		           padding: [15,10,0,15],
+		           enableScroll: false,
+		           legend: {},
+		           xAxis: {
+		             disableGrid: true
+		           },
+		           yAxis: {
+		             gridType: "dash",
+		             dashLength: 2
+		           },
+		           extra: {
+		             line: {
+		               type: "curve",
+		               width: 2,
+		               activeType: "hollow"
+		             }
+		           }
+		     
+	   },
 	    chartData1:{},
 	         opts1: {
 	           color: ["#1890FF","#91CB74","#FAC858","#EE6666","#73C0DE","#3CA272","#FC8452","#9A60B4","#ea7ccc"],
@@ -122,7 +123,7 @@
 			              }
 			            ]
 			          };
-			        this.chartData = JSON.parse(JSON.stringify(res));
+			          this.chartData = JSON.parse(JSON.stringify(res))	
 			      }, 500);
 				    setTimeout(() => {
@@ -15,7 +15,8 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
 	var bases = ''
 	if(baseUrl == 1){
 		// bases = 'http://8.130.38.56:8027/admin-server' + url;
-		bases = 'http://172.16.61.125:9003' + url;
+		// bases = 'http://172.16.61.125:9003' + url;
+		bases = 'http://192.168.2.225:9003' + url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
 		// bases = 'https://jy.scjysm.asia:18086/admin-server' + url;