1

package.json

@@ -14,6 +14,7 @@
     "@riophae/vue-treeselect": "^0.4.0",
     "ali-oss": "^6.12.0",
     "axios": "^0.18.1",
+    "browser-md5-file": "^1.0.0",
     "co": "^4.6.0",
     "core-js": "^3.6.5",
     "cos-js-sdk-v5": "^1.1.5",
@@ -24,11 +25,13 @@
     "lrz": "^4.9.41",
     "mavon-editor": "^2.9.1",
     "print-js": "^1.6.0",
+    "qrcode": "^1.4.4",
     "qrcodejs2": "0.0.2",
     "quasar": "^1.0.0",
     "relation-graph": "^1.0.8",
     "v-viewer": "^1.5.1",
     "vue-amap": "^0.5.10",
+    "vue-draggable-resizable": "^1.7.2",
     "vue-easytable": "^1.7.2",
     "vue-i18n": "^8.0.0",
     "vue-inline-svg": "^2.0.0",

src/api/AD/index.js

@@ -34,4 +34,53 @@ export function delAd(data) {
         method: 'post',
         data
     })
+}
+
+/**
+ * 保存制作的广告图
+ * @param {JSON参数} data 
+ */
+export function saveMakeAd(data) {
+    return request({
+        url: '/Advertising/Set',
+        method: 'post',
+        data
+    })
+}
+
+
+/**
+ * 获取我的广告图
+ * @param {JSON参数} data 
+ */
+export function getMyAd(data) {
+    return request({
+        url: '/Advertising/GetPageList',
+        method: 'post',
+        data
+    })
+}
+
+/**
+ * 删除我的广告图
+ * @param {JSON参数} data 
+ */
+export function delMyAd(data) {
+    return request({
+        url: '/Advertising/Remove',
+        method: 'post',
+        data
+    })
+}
+
+/**
+ * 我的广告图详情
+ * @param {JSON参数} data 
+ */
+export function getMyAdDetail(data) {
+    return request({
+        url: '/Advertising/Get',
+        method: 'post',
+        data
+    })
 }
\ No newline at end of file

src/assets/css/advert/advmanager.css

@@ -128,13 +128,19 @@
     top: 40px;
     left: 15px;
     position: absolute;
+    width: 200px;
+}
+.label-box .ad-label{
+    max-width: 50px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
     background:rgba(0,0,0,.5);
     color: #f5f5f5;
     padding:0px 5px;
     border-radius: 4px;
     font-size: 12px;
-    display: inline-block;
-    width: 200px;
+    /* display: inline-block; */
 }
 .advmanager-box .query-box ul .el-input{
     width: 150px;

src/pages/activity/activeSignUpList.vue

@@ -209,7 +209,7 @@
           pageSize: 10,
           ActivityId:0,
           EnrollState:3,
-          rowsPerPage:1000
+          rowsPerPage:0
         },
         pageCount: 0,
         columns: [

src/pages/activity/advmanager.vue

@@ -21,7 +21,7 @@
                         <i class="iconfont icon-star star"></i>&nbsp; {{props.value.AdvertisingCount}}
                     </div>
                     <div class="label-box" v-if="props.value.LableList.length>0">
-                        <div v-for="(item,index) in props.value.LableList" :key="index">
+                        <div v-for="(item,index) in props.value.LableList" :key="index" class="ad-label" v-if="index<3">
                             {{ item }}
                         </div>
                     </div>

src/pages/activity/materialMan.vue

@@ -527,6 +527,7 @@
         });
       },
       UploadImage(file) {
+        console.log(530,file)
         this.UploadFileToTencent(this.FileType().GoodsImg, file.file, res => {
           if (res.resultCode == 1) {
             this.Success('上传成功')
@@ -693,7 +694,6 @@
           data.forEach(item => {
             this.checkAllList.push(item.Id)
             item.Selected = false;
-            console.log(768,item)
           })
           this.PageList = data;
           this.$forceUpdate();

src/pages/activity/payment.vue

@@ -319,7 +319,7 @@
           </tr>
           <tr v-for="(item,index) in dataList.OtherFiniceReciveList" :key="index">
             <td>
-              <span class="finince_Order">{{item.FrID}}</span>
+              <span class="finince_Order" @click="goOrderDetail('FinancialDocumentsDetail',item)">{{item.FrID}}</span>
             </td>
             <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
             <td style="text-align:left;">