webapp / GreenwayWeb

Commit 468cd09772dbb2a538dc3c2daedf90148385d1b0

Authored by wesley88
2 parents 8d14e1a2 66ab3b4a

Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

Inline Side-by-side
Showing 13 changed files with 105 additions and 50 deletions
admin-web-master/src/views/activity/activityBz.vue
  View file @468cd09
... ... @@ -812,7 +812,7 @@
812 812 // .then(data => console.log(data))
813 813 // .catch(error => console.log(error));
814 814  
815   - this.$emit('childClose', false);
  815 +
816 816 this.$refs.editor.html = '<p><br></p>'
817 817 this.ruleForm = {
818 818 classificationCode: '',
... ... @@ -843,7 +843,7 @@
843 843 solutionEditor: null,
844 844 }
845 845 })
846   -
  846 + this.$emit('childClose', false);
847 847 } else {
848 848 this.$message({
849 849 message: '请填写数据',
... ...
admin-web-master/src/views/activity/activityHis.vue
  View file @468cd09
... ... @@ -283,9 +283,7 @@
283 283 </el-table-column>
284 284 <el-table-column label="操作" min-width="20%">
285 285 <template slot-scope="scope">
286   - <!-- <div class="tableBtn greens" @click="Down(scope.row)">下载</div> -->
287   - <a class="tableBtn greens" :href="scope.row.attachmentUrl"
288   - target="_blank" download>下载</a>
  286 + <div class="tableBtn greens" @click="Down($baseURL+scope.row.attachmentUrl)">下载</div>
289 287 </template>
290 288 </el-table-column>
291 289  
... ... @@ -935,9 +933,7 @@
935 933 </el-table-column>
936 934 <el-table-column label="操作" min-width="20%">
937 935 <template slot-scope="scope">
938   - <!-- <div class="tableBtn greens" @click="Down(scope.row)">下载</div> -->
939   - <a class="tableBtn greens" :href="scope.row.attachmentUrl" target="_blank"
940   - download>下载</a>
  936 + <div class="tableBtn greens" @click="Down($baseURL+scope.row.attachmentUrl)">下载</div>
941 937 </template>
942 938 </el-table-column>
943 939  
... ... @@ -2515,7 +2511,15 @@ this.ListOne = item.planName
2515 2511 })
2516 2512 },
2517 2513  
2518   -
  2514 +Down(url){
  2515 + const a = document.createElement('a');
  2516 + a.href = url;
  2517 + a.download = url.split('/').pop(); // 以文件名作为下载后的文件名
  2518 + a.style.display = 'none';
  2519 + document.body.appendChild(a);
  2520 + a.click();
  2521 + document.body.removeChild(a);
  2522 + },
2519 2523 async daochu() {
2520 2524 let res = await excelQueryByPage(this.pageindex)
2521 2525 if (!res) {
... ...
admin-web-master/src/views/activity/activitySp.vue
  View file @468cd09
... ... @@ -734,9 +734,9 @@
734 734 </el-table-column>
735 735 <el-table-column label="操作" min-width="20%">
736 736 <template slot-scope="scope">
737   - <!-- <div class="tableBtn greens" @click="Down(scope.row)">下载</div> -->
738   - <a class="tableBtn greens" :href="scope.row.attachmentUrl"
739   - target="_blank" download>下载</a>
  737 + <div class="tableBtn greens" @click="Down($baseURL+scope.row.attachmentUrl)">下载</div>
  738 + <!-- <a class="tableBtn greens" :href="scope.row.attachmentUrl"
  739 + target="_blank" download>下载</a> -->
740 740 </template>
741 741 </el-table-column>
742 742  
... ... @@ -1622,6 +1622,15 @@
1622 1622 this.liuYe = 1
1623 1623  
1624 1624 },
  1625 + Down(url){
  1626 + const a = document.createElement('a');
  1627 + a.href = url;
  1628 + a.download = url.split('/').pop(); // 以文件名作为下载后的文件名
  1629 + a.style.display = 'none';
  1630 + document.body.appendChild(a);
  1631 + a.click();
  1632 + document.body.removeChild(a);
  1633 + },
1625 1634 }
1626 1635 }
1627 1636 </script>
... ...
admin-web-master/src/views/activity/index.vue
  View file @468cd09
... ... @@ -123,7 +123,7 @@
123 123 <div class="tableBtn greens" @click="xiaoguo(scope.row)"
124 124 v-if="scope.row.state == '5'">效果评估</div>
125 125 <!-- <div class="tableBtn greens">策略调整</div> -->
126   - <div class="tableBtn greens" @click="koop(scope.row)">复制</div>
  126 + <!-- <div class="tableBtn greens" @click="koop(scope.row)">复制</div> -->
127 127 <div class="tableBtn greens" @click="handleDelete(scope.row.id)">删除</div>
128 128 </template>
129 129 </el-table-column>
... ... @@ -736,9 +736,9 @@
736 736 </el-table-column>
737 737 <el-table-column label="操作" min-width="20%">
738 738 <template slot-scope="scope">
739   - <!-- <div class="tableBtn greens" @click="Down(scope.row)">下载</div> -->
740   - <a class="tableBtn greens" :href="$baseURL+scope.row.attachmentUrl"
741   - target="_blank" download>下载</a>
  739 + <div class="tableBtn greens" @click="Down($baseURL+scope.row.attachmentUrl)">下载</div>
  740 + <!-- <a class="tableBtn greens" :href="$baseURL+scope.row.attachmentUrl"
  741 + target="_blank" download>下载</a> -->
742 742 </template>
743 743 </el-table-column>
744 744  
... ... @@ -2262,6 +2262,15 @@
2262 2262  
2263 2263  
2264 2264 },
  2265 + Down(url){
  2266 + const a = document.createElement('a');
  2267 + a.href = url;
  2268 + a.download = url.split('/').pop(); // 以文件名作为下载后的文件名
  2269 + a.style.display = 'none';
  2270 + document.body.appendChild(a);
  2271 + a.click();
  2272 + document.body.removeChild(a);
  2273 + },
2265 2274 async daochu() {
2266 2275 let res = await excelQueryByPage(this.pageindex)
2267 2276 if (!res) {
... ...
admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
  View file @468cd09
... ... @@ -59,11 +59,11 @@
59 59  
60 60  
61 61 <!-- <el-table-column label="申请人" prop="applicant" ></el-table-column> -->
62   - <el-table-column label="投放定价" prop="tenant">
  62 + <!-- <el-table-column label="投放定价" prop="tenant">
63 63 <template slot-scope="scope">
64 64 {{scope.row.rotationOrde || '-'}}
65 65 </template>
66   - </el-table-column>
  66 + </el-table-column> -->
67 67 <el-table-column label="投放时间" prop="scheduleTime" >
68 68 </el-table-column>
69 69 <el-table-column prop="applicationTime" label="提交时间" >
... ...
admin-web-master/src/views/atmosphere/atmosphereBz.vue
  View file @468cd09
... ... @@ -718,21 +718,23 @@
718 718 message: '保存成功',
719 719 type: 'success'
720 720 });
  721 + console.log(this.tableData,'111111111111111111')
721 722 for (let i = 0; i < this.tableData.length; i++) {
722 723 this.tableData[i].detailsId = res.data.id
723 724 MingAdd(this.tableData[i]).then(res => {
724 725  
725 726 })
726 727 }
  728 + console.log(this.dataList,'22222222222222222222')
727 729 for (let i = 0; i < this.dataList.length; i++) {
728   - let fuji = {
729   - detailsId: res.data.id,
730   - attachmentName: this.dataList[i].name,
731   - attachmentUrl: this.dataList[i].response.data.url,
732   - }
733   - fujiaAdd(fuji).then(res => {
734   -
735   - })
  730 + let fuji = {
  731 + detailsId: res.data.id,
  732 + attachmentName: this.dataList[i].name,
  733 + attachmentUrl: this.dataList[i].url,
  734 + }
  735 + fujiaAdd(fuji).then(res => {
  736 + console.log('成功')
  737 + })
736 738 }
737 739  
738 740 // const pdf = new jsPDF('p', 'mm', 'a4');
... ... @@ -760,7 +762,7 @@
760 762 // .then(response => response.json())
761 763 // .then(data => console.log(data))
762 764 // .catch(error => console.log(error));
763   -
  765 + this.$emit('childClose', false);
764 766 this.$refs.editor.html = '<p><br></p>'
765 767 this.ruleForm = {
766 768 classificationCode: '',
... ...
admin-web-master/src/views/atmosphere/atmosphereGl.vue
  View file @468cd09
... ... @@ -122,7 +122,7 @@
122 122 <div class="tableBtn greens" @click="xiaoguo(scope.row)"
123 123 v-if="scope.row.state == '5'">效果评估</div>
124 124 <!-- <div class="tableBtn greens">策略调整</div> -->
125   - <div class="tableBtn greens" @click="koop(scope.row)">复制</div>
  125 + <!-- <div class="tableBtn greens" @click="koop(scope.row)">复制</div> -->
126 126 <div class="tableBtn greens" @click="handleDelete(scope.row.id)">删除</div>
127 127 </template>
128 128 </el-table-column>
... ... @@ -730,8 +730,7 @@
730 730 </el-table-column>
731 731 <el-table-column label="操作" prop="text" min-width="20%">
732 732 <template slot-scope="scope">
733   - <a class="tableBtn greens" :href="scope.row.attachmentUrl" target="_blank"
734   - download>下载</a>
  733 + <div class="tableBtn greens" @click="Down($baseURL+scope.row.attachmentUrl)">下载</div>
735 734 </template>
736 735 </el-table-column>
737 736  
... ... @@ -2304,6 +2303,15 @@
2304 2303  
2305 2304  
2306 2305 },
  2306 + Down(url){
  2307 + const a = document.createElement('a');
  2308 + a.href = url;
  2309 + a.download = url.split('/').pop(); // 以文件名作为下载后的文件名
  2310 + a.style.display = 'none';
  2311 + document.body.appendChild(a);
  2312 + a.click();
  2313 + document.body.removeChild(a);
  2314 + },
2307 2315 async daochu() {
2308 2316 let res = await excelQueryByPage(this.pageindex)
2309 2317 if (!res) {
... ...
admin-web-master/src/views/atmosphere/atmosphereHis.vue
  View file @468cd09
... ... @@ -283,9 +283,7 @@
283 283 </el-table-column>
284 284 <el-table-column label="操作" min-width="20%">
285 285 <template slot-scope="scope">
286   - <!-- <div class="tableBtn greens" @click="Down(scope.row)">下载</div> -->
287   - <a class="tableBtn greens" :href="scope.row.attachmentUrl"
288   - target="_blank" download>下载</a>
  286 + <div class="tableBtn greens" @click="Down($baseURL+scope.row.attachmentUrl)">下载</div>
289 287 </template>
290 288 </el-table-column>
291 289  
... ... @@ -1106,9 +1104,7 @@
1106 1104 </el-table-column>
1107 1105 <el-table-column label="操作" min-width="20%">
1108 1106 <template slot-scope="scope">
1109   - <!-- <div class="tableBtn greens" @click="Down(scope.row)">下载</div> -->
1110   - <a class="tableBtn greens" :href="scope.row.attachmentUrl" target="_blank"
1111   - download>下载</a>
  1107 + <div class="tableBtn greens" @click="Down($baseURL+scope.row.attachmentUrl)">下载</div>
1112 1108 </template>
1113 1109 </el-table-column>
1114 1110  
... ... @@ -2667,7 +2663,15 @@ this.ListOne = item.planName
2667 2663 this.getAll()
2668 2664 })
2669 2665 },
2670   -
  2666 +Down(url){
  2667 + const a = document.createElement('a');
  2668 + a.href = url;
  2669 + a.download = url.split('/').pop(); // 以文件名作为下载后的文件名
  2670 + a.style.display = 'none';
  2671 + document.body.appendChild(a);
  2672 + a.click();
  2673 + document.body.removeChild(a);
  2674 + },
2671 2675  
2672 2676 async daochu() {
2673 2677 let res = await excelQueryByPage(this.pageindex)
... ...
admin-web-master/src/views/atmosphere/atmosphereSp.vue
  View file @468cd09
... ... @@ -890,7 +890,7 @@
890 890 </el-table-column>
891 891 <el-table-column label="操作" prop="text" min-width="20%">
892 892 <template slot-scope="scope">
893   - <a class="tableBtn greens" :href="scope.row.attachmentUrl" target="_blank" download>下载</a>
  893 + <div class="tableBtn greens" @click="Down($baseURL+scope.row.attachmentUrl)">下载</div>
894 894 </template>
895 895 </el-table-column>
896 896  
... ... @@ -1671,6 +1671,15 @@
1671 1671 formTime(data){
1672 1672 this.zhixingList.planTime = data
1673 1673 },
  1674 + Down(url){
  1675 + const a = document.createElement('a');
  1676 + a.href = url;
  1677 + a.download = url.split('/').pop(); // 以文件名作为下载后的文件名
  1678 + a.style.display = 'none';
  1679 + document.body.appendChild(a);
  1680 + a.click();
  1681 + document.body.removeChild(a);
  1682 + },
1674 1683 }
1675 1684 }
1676 1685 </script>
... ...
admin-web-master/src/views/serve/procedure.vue
  View file @468cd09
... ... @@ -116,7 +116,6 @@
116 116 <div v-if="edit" style="
117 117 height: 38px;
118 118 line-height: 38px;
119   - border: 1px solid #ebeef5;
120 119 padding: 0 20px;
121 120 font-size: 14px;
122 121 ">
... ... @@ -143,7 +142,6 @@
143 142 <div v-if="edit" style="
144 143 height: 38px;
145 144 line-height: 38px;
146   - border: 1px solid #ebeef5;
147 145 padding: 0 20px;
148 146 font-size: 14px;
149 147 ">
... ... @@ -176,11 +174,20 @@
176 174 <div style="
177 175 font-size: 14px;
178 176 ">
179   - <div>
180   - <div style="padding:20px;" v-if="edit"
181   - v-html="secondData.announcementContent"></div>
182   - <wang-editor v-model="secondData.announcementContent"
183   - ref="editor" v-else></wang-editor>
  177 + <div style="padding:20px;width: 100%;" v-if="edit"
  178 + v-html="secondData.announcementContent"></div>
  179 + <!-- <wang-editor v-model="secondData.announcementContent"
  180 + ref="editor" v-else></wang-editor> -->
  181 + <el-input
  182 + style="width: 100%;"
  183 + type="textarea"
  184 + :rows="5"
  185 + placeholder="请输入内容"
  186 + v-else
  187 + v-model="secondData.announcementContent"/>
  188 + <div style="width: 100%;">
  189 +
  190 +
184 191 </div>
185 192 </div>
186 193  
... ... @@ -244,8 +251,12 @@
244 251 </el-form-item>
245 252 <el-form-item label="公告内容" >
246 253 <div>
247   - <wang-editor v-model="ruleForm.announcementContent" ref="editor"></wang-editor>
248   -
  254 + <!-- <wang-editor v-model="ruleForm.announcementContent" ref="editor"></wang-editor> -->
  255 + <el-input
  256 + type="textarea"
  257 + :rows="5"
  258 + placeholder="请输入内容"
  259 + v-model="ruleForm.announcementContent"/>
249 260 </div>
250 261 </el-form-item>
251 262 </el-form>
... ...
admin-web-master/src/views/shopbus/businessList/index.vue
  View file @468cd09
... ... @@ -220,7 +220,7 @@
220 220 v-if="dialogVisible"
221 221 style="background-color: #fff;min-height: 94vh;"
222 222 >
223   - <div style="height:58px;line-height:58px;">
  223 + <div style="height:58px;line-height:58px;padding-left: 20px;">
224 224 <div style="color:#0006"> <span>商城商家管理</span> <span style="padding:0 5px;">></span> <span
225 225 style="color:#000000e6">{{ userState === 0?'新增商家':userState === 1?'修改商家':'查看商家'}}</span></div>
226 226 </div>
... ...
lvdao-miniapp/pages/home/home.vue
  View file @468cd09
... ... @@ -714,7 +714,6 @@
714 714 url: `/pagesA/weball/shopweb?phone=${uni.getStorageSync('user').phone}`
715 715 })
716 716 }else{
717   - console.log('2222222')
718 717 uni.navigateTo({
719 718 url: `/pagesA/weball/shopweb?phone="1"`
720 719 })
... ...
lvdao-miniapp/utils/request.js
  View file @468cd09
... ... @@ -21,7 +21,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
21 21 // bases = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server' + url;
22 22 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
23 23  
24   - // bases = 'http://128.10.249.9:9003'+ url;
  24 + // bases = 'http://192.168.8.103:9003'+ url;
25 25 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
26 26  
27 27 bases = c1 + 'cdwlMall/meserver/admin-server' + url;
... ...