webapp / GreenwayWeb

Commit cdf6c4c97c273561f435591a8d4df846fcc57331

Authored by 杨鑫
1 parent a4aeeb1e

最新

Inline Side-by-side
Showing 23 changed files with 140 additions and 106 deletions
admin-web-master/src/App.vue
  View file @cdf6c4c
... ... @@ -387,7 +387,7 @@ export default {
387 387 border: none;
388 388 margin-right: 10px;
389 389 background-color: #F2F2F2;
390   - font-size:12px;
  390 + font-size:14px;
391 391 border-top-left-radius: 8px;
392 392 border-top-right-radius: 8px;
393 393 padding:0 15px;
... ... @@ -426,7 +426,7 @@ export default {
426 426 border: none;
427 427 margin-right: 10px;
428 428 background-color: #F2F2F2;
429   - font-size:12px;
  429 + font-size:14px;
430 430 border-top-left-radius: 8px;
431 431 border-top-right-radius: 8px;
432 432 padding:0 15px;
... ... @@ -466,7 +466,7 @@ export default {
466 466 border: none;
467 467 margin-right: 10px;
468 468 background-color: #F2F2F2;
469   - font-size:12px;
  469 + font-size:14px;
470 470 border-top-left-radius: 8px;
471 471 border-top-right-radius: 8px;
472 472 padding:0 15px;
... ...
admin-web-master/src/utils/request.js
  View file @cdf6c4c
... ... @@ -22,7 +22,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost
22 22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
23 23  
24 24  
25   - // baseURL = 'http://128.10.249.20:9003';
  25 + // baseURL = 'http://128.10.249.26:9003';
26 26  
27 27  
28 28 } else {
... ...
admin-web-master/src/views/aaa/index.vue
  View file @cdf6c4c
... ... @@ -22,7 +22,7 @@
22 22 </el-table-column>
23 23 <el-table-column label="轮播图" prop="" min-width="20%">
24 24 <template slot-scope="scope">
25   - <el-image style="height: 80px;" :src="$baseURL+scope.row.imageUrl" fit="contain"></el-image>
  25 + <el-image style="height: 80px;" :src="scope.row.imageUrl" fit="contain"></el-image>
26 26 </template>
27 27 </el-table-column>
28 28  
... ... @@ -168,6 +168,7 @@
168 168 addCheck() {
169 169 this.$refs.ruleForm.validate((valid) => {
170 170 if (valid) {
  171 + this.formInline.imageUrl = this.$baseURL+this.formInline.imageUrl
171 172 bannerAdd(this.formInline).then(()=>{
172 173 this.$message({
173 174 message: '保存成功',
... ...
admin-web-master/src/views/activity/activityHis.vue
  View file @cdf6c4c
... ... @@ -191,7 +191,7 @@
191 191 <div style="font-size: 14px;padding: 10px 20px 0px 20px;">活动明细信息</div>
192 192 <div style="padding: 10px 20px;">
193 193 <el-table :data="tableData2"
194   - :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
  194 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
195 195 style="width: 100%;margin: auto;">
196 196 <el-table-column label="序号" min-width="5%" align='center'>
197 197 <template slot-scope="scope">
... ... @@ -263,7 +263,7 @@
263 263 <div style="font-size: 14px;padding: 10px 20px 0px 20px;">相关附件信息</div>
264 264 <div style="padding:10px 20px;">
265 265 <el-table :data="tableData6"
266   - :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
  266 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
267 267 style="width: 100%;margin: auto;">
268 268 <el-table-column label="序号" min-width="5%" align='center'>
269 269 <template slot-scope="scope">
... ... @@ -1854,13 +1854,9 @@
1854 1854 return '待提交';
1855 1855 case '1':
1856 1856 return '待审核';
1857   - case '2':
1858   - return '业务部审核';
1859   - case '3':
1860   - return '品牌审核';
1861   - case '4':
1862   - return '审核通过';
1863 1857 case '5':
  1858 + return '审核通过';
  1859 + case '6':
1864 1860 return '审核不通过'
1865 1861 }
1866 1862 },
... ...
admin-web-master/src/views/activity/activitySp.vue
  View file @cdf6c4c
... ... @@ -645,7 +645,7 @@
645 645 <div style="font-size: 14px;padding: 10px 20px 0px 20px;">活动明细信息</div>
646 646 <div style="padding: 10px 20px;">
647 647 <el-table :data="tableData2"
648   - :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
  648 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
649 649 style="width: 100%;margin: auto;">
650 650 <el-table-column label="序号" min-width="5%" align='center'>
651 651 <template slot-scope="scope">
... ... @@ -717,7 +717,7 @@
717 717 <div style="font-size: 14px;padding: 10px 20px 0px 20px;">相关附件信息</div>
718 718 <div style="padding:10px 20px;">
719 719 <el-table :data="tableData6"
720   - :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
  720 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
721 721 style="width: 100%;margin: auto;">
722 722 <el-table-column label="序号" min-width="5%" align='center'>
723 723 <template slot-scope="scope">
... ... @@ -1250,13 +1250,9 @@
1250 1250 return '待提交';
1251 1251 case '1':
1252 1252 return '待审核';
1253   - case '2':
1254   - return '业务部审核';
1255   - case '3':
1256   - return '品牌审核';
1257   - case '4':
1258   - return '审核通过';
1259 1253 case '5':
  1254 + return '审核通过';
  1255 + case '6':
1260 1256 return '审核不通过'
1261 1257 }
1262 1258 },
... ...
admin-web-master/src/views/activity/index.vue
  View file @cdf6c4c
... ... @@ -648,7 +648,7 @@
648 648 <div style="font-size: 14px;padding: 10px 20px 0px 20px;">活动明细信息</div>
649 649 <div style="padding: 10px 20px;">
650 650 <el-table :data="tableData2"
651   - :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
  651 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
652 652 style="width: 100%;margin: auto;">
653 653 <el-table-column label="序号" min-width="5%" align='center'>
654 654 <template slot-scope="scope">
... ... @@ -719,7 +719,7 @@
719 719 <div style="font-size: 14px;padding: 10px 20px 0px 20px;">相关附件信息</div>
720 720 <div style="padding:10px 20px;">
721 721 <el-table :data="tableData6"
722   - :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
  722 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
723 723 style="width: 100%;margin: auto;">
724 724 <el-table-column label="序号" min-width="5%" align='center'>
725 725 <template slot-scope="scope">
... ... @@ -1331,13 +1331,9 @@
1331 1331 return '待提交';
1332 1332 case '1':
1333 1333 return '待审核';
1334   - case '2':
1335   - return '业务部审核';
1336   - case '3':
1337   - return '品牌审核';
1338   - case '4':
1339   - return '审核通过';
1340 1334 case '5':
  1335 + return '审核通过';
  1336 + case '6':
1341 1337 return '审核不通过'
1342 1338 }
1343 1339 },
... ...
admin-web-master/src/views/atmosphere/atmosphereGl.vue
  View file @cdf6c4c
... ... @@ -151,7 +151,7 @@
151 151 <el-form-item label="明细项名称" class="grid-content bg-purple device-from" prop="planName">
152 152 <el-input v-model="mingFrom.detailLtemName" placeholder="请输入" />
153 153 </el-form-item>
154   - <el-form-item label="实际数量" class="grid-content bg-purple" prop=" planType">
  154 + <el-form-item label="实际数量(元)" class="grid-content bg-purple" prop=" planType">
155 155 <el-input v-model="mingFrom.estimatedQuantity" placeholder="请输入" />
156 156 </el-form-item>
157 157  
... ... @@ -617,7 +617,7 @@
617 617 <div style="font-size: 14px;padding: 10px 20px 0px 20px;">基本信息</div>
618 618 <div style="padding: 10px 20px;">
619 619 <el-table :data="tableData1"
620   - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#fff'}"
  620 + :header-cell-style="{fontSize: '14px',color:'#000000e6',fontWeight: 'normal',backgroundColor:'#fff'}"
621 621 style="width: 100%;margin: auto;">
622 622 <el-table-column class-name="first-column-bg" label="方案编号" prop="name"
623 623 min-width="15%">
... ... @@ -641,7 +641,7 @@
641 641 <div style="font-size: 14px;padding: 10px 20px 0px 20px;">活动明细信息</div>
642 642 <div style="padding: 10px 20px;">
643 643 <el-table :data="tableData2"
644   - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#fff'}"
  644 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
645 645 style="width: 100%;margin: auto;">
646 646 <el-table-column label="序号" min-width="5%" align='center'>
647 647 <template slot-scope="scope">
... ... @@ -665,7 +665,7 @@
665 665 <div style="font-size: 14px;padding: 10px 20px 0px 20px;">活动成本信息</div>
666 666 <div style="padding:10px 20px;">
667 667 <el-table :data="tableData3"
668   - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#fff'}"
  668 + :header-cell-style="{fontSize: '14px',color:'#000000e6',fontWeight: 'normal',backgroundColor:'#fff'}"
669 669 style="width: 100%;margin: auto;">
670 670 <el-table-column class-name="first-column-bg" label="内部人力成本预估(元)" prop="name"
671 671 min-width="15%">
... ... @@ -689,7 +689,7 @@
689 689 <div style="font-size: 14px;padding:10px 20px 0px 20px;">预估效果</div>
690 690 <div style="padding:10px 20px;">
691 691 <el-table :data="tableData4"
692   - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#fff'}"
  692 + :header-cell-style="{fontSize: '14px',color:'#000000e6',fontWeight: 'normal',backgroundColor:'#fff'}"
693 693 style="width: 100%;margin: auto;">
694 694 <el-table-column class-name="first-column-bg" label="预计吸引流量" prop="name"
695 695 min-width="15%">
... ... @@ -712,7 +712,7 @@
712 712 <div style="font-size: 14px;padding: 10px 20px 0px 20px;">相关附件信息</div>
713 713 <div style="padding:10px 20px;">
714 714 <el-table :data="tableData6"
715   - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#fff'}"
  715 + :header-cell-style="{fontSize: '14px',color:'#000000e6',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
716 716 style="width: 100%;margin: auto;">
717 717 <el-table-column label="序号" min-width="5%" align='center'>
718 718 <template slot-scope="scope">
... ... @@ -736,7 +736,7 @@
736 736 <div style="font-size: 14px;padding: 10px 20px 0px 20px;">系统信息</div>
737 737 <div style="padding:10px 20px;">
738 738 <el-table :data="tableData5"
739   - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#fff'}"
  739 + :header-cell-style="{fontSize: '14px',color:'#000000e6',fontWeight: 'normal',backgroundColor:'#fff'}"
740 740 style="width: 100%;margin: auto;">
741 741 <el-table-column class-name="first-column-bg" label="创建人" prop="name"
742 742 min-width="15%">
... ... @@ -1379,13 +1379,9 @@
1379 1379 return '待提交';
1380 1380 case '1':
1381 1381 return '待审核';
1382   - case '2':
1383   - return '业务部审核';
1384   - case '3':
1385   - return '品牌审核';
1386   - case '4':
1387   - return '审核通过';
1388 1382 case '5':
  1383 + return '审核通过';
  1384 + case '6':
1389 1385 return '审核不通过'
1390 1386 }
1391 1387 },
... ...
admin-web-master/src/views/atmosphere/atmosphereHis.vue
  View file @cdf6c4c
... ... @@ -191,7 +191,7 @@
191 191 <div style="font-size: 14px;padding: 10px 20px 0px 20px;">氛围明细信息</div>
192 192 <div style="padding: 10px 20px;">
193 193 <el-table :data="tableData2"
194   - :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
  194 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
195 195 style="width: 100%;margin: auto;">
196 196 <el-table-column label="序号" min-width="5%" align='center'>
197 197 <template slot-scope="scope">
... ... @@ -263,7 +263,7 @@
263 263 <div style="font-size: 14px;padding: 10px 20px 0px 20px;">相关附件信息</div>
264 264 <div style="padding:10px 20px;">
265 265 <el-table :data="tableData6"
266   - :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
  266 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
267 267 style="width: 100%;margin: auto;">
268 268 <el-table-column label="序号" min-width="5%" align='center'>
269 269 <template slot-scope="scope">
... ... @@ -1778,20 +1778,25 @@
1778 1778 staut: false,
1779 1779 },
1780 1780 lishiList: null,
1781   - labelStyle: {
1782   - width: '197px',
1783   - height: '42px',
1784   - },
1785   - labelStyleOne: {
1786   - width: '110px',
1787   - height: '42px',
1788   - color: '#000',
1789   - },
1790   - contentClassNameOne: {
1791   - width: '219px',
1792   - padding: '9px 10px',
1793   - // height:'42px',
1794   - },
  1781 + labelStyle: {
  1782 + width: '250px',
  1783 + height: '42px',
  1784 + },
  1785 + contentStyle: {
  1786 + width: '300px',
  1787 +
  1788 + // height:'42px',
  1789 + },
  1790 + labelStyleOne: {
  1791 + width: '94px',
  1792 + height: '42px',
  1793 + color: '#000',
  1794 + },
  1795 + contentClassNameOne: {
  1796 + width: '219px',
  1797 + padding: '9px 10px',
  1798 + // height:'42px',
  1799 + },
1795 1800 lidata: [],
1796 1801 lixiang: {},
1797 1802 duibiList: {},
... ... @@ -1845,13 +1850,9 @@
1845 1850 return '待提交';
1846 1851 case '1':
1847 1852 return '待审核';
1848   - case '2':
1849   - return '业务部审核';
1850   - case '3':
1851   - return '品牌审核';
1852   - case '4':
1853   - return '审核通过';
1854 1853 case '5':
  1854 + return '审核通过';
  1855 + case '6':
1855 1856 return '审核不通过'
1856 1857 }
1857 1858 },
... ... @@ -2183,6 +2184,16 @@
2183 2184 });
2184 2185 }
2185 2186 },
  2187 + formatTimestampToDate(timestamp) {
  2188 + const date = new Date(timestamp);
  2189 + const year = date.getFullYear();
  2190 + const month = String(date.getMonth() + 1).padStart(2, '0');
  2191 + const day = String(date.getDate()).padStart(2, '0');
  2192 + const hours = String(date.getHours()).padStart(2, '0');
  2193 + const minutes = String(date.getMinutes()).padStart(2, '0');
  2194 + const seconds = String(date.getSeconds()).padStart(2, '0');
  2195 + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
  2196 + },
2186 2197 tableAll() {
2187 2198 this.$refs.mulTable.clearSelection(); // 清除所有选项
2188 2199 const allRows = this.$refs.mulTable.data; // 获取所有行数据
... ... @@ -2511,7 +2522,7 @@
2511 2522 this.searchShow = true
2512 2523 },
2513 2524 lichange(e) {
2514   -
  2525 + console.log(e)
2515 2526 // this.lishiList = e
2516 2527 // let msg = this.liData[e]
2517 2528 // this.duibiList = JSON.parse(msg.modifyContent)
... ...
admin-web-master/src/views/atmosphere/atmosphereSp.vue
  View file @cdf6c4c
... ... @@ -807,7 +807,7 @@
807 807 <div style="font-size: 14px;padding: 10px 20px 0px 20px;">活动明细信息</div>
808 808 <div style="padding: 10px 20px;">
809 809 <el-table :data="tableData2"
810   - :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
  810 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
811 811 style="width: 100%;margin: auto;">
812 812 <el-table-column label="序号" min-width="5%" align='center'>
813 813 <template slot-scope="scope">
... ... @@ -872,7 +872,7 @@
872 872 <div style="font-size: 14px;padding: 10px 20px 0px 20px;">相关附件信息</div>
873 873 <div style="padding:10px 20px;">
874 874 <el-table :data="tableData6"
875   - :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"
  875 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
876 876 style="width: 100%;margin: auto;">
877 877 <el-table-column label="序号" min-width="5%" align='center'>
878 878 <template slot-scope="scope">
... ... @@ -1343,20 +1343,16 @@
1343 1343 },
1344 1344 methods: {
1345 1345 getStatus(state) {
1346   - switch (state) {
1347   - case '':
1348   - return '待提交';
1349   - case '1':
1350   - return '待审核';
1351   - case '2':
1352   - return '业务部审核';
1353   - case '3':
1354   - return '品牌审核';
1355   - case '4':
1356   - return '审核通过';
1357   - case '5':
1358   - return '审核不通过'
1359   - }
  1346 + switch (state) {
  1347 + case '':
  1348 + return '待提交';
  1349 + case '1':
  1350 + return '待审核';
  1351 + case '5':
  1352 + return '审核通过';
  1353 + case '6':
  1354 + return '审核不通过'
  1355 + }
1360 1356 },
1361 1357 //查询全数据
1362 1358 async getAll() {
... ...
admin-web-master/src/views/promotion/account.vue
  View file @cdf6c4c
... ... @@ -83,9 +83,9 @@
83 83 </el-table-column>
84 84 <el-table-column label="渠道名称" prop="channelName" min-width="150" show-overflow-tooltip>
85 85 </el-table-column>
86   - <el-table-column label="类型" prop="channelType" min-width="120">
  86 + <!-- <el-table-column label="类型" prop="channelType" min-width="120">
87 87  
88   - </el-table-column>
  88 + </el-table-column> -->
89 89 <el-table-column label="备注" prop="notes" min-width="200">
90 90  
91 91 </el-table-column>
... ...
admin-web-master/src/views/promotion/audit.vue
  View file @cdf6c4c
... ... @@ -93,8 +93,8 @@
93 93 <img :src="$baseURL+secondData.coverImage" alt="" style="width:150px;height: 150px;" />
94 94 </div>
95 95 </el-form-item>
96   - <el-form-item label="宣传内容" class="grid-content bg-purple" prop="updateUser">
97   - <div style="padding:20px;" v-html="secondData.updateUser"></div>
  96 + <el-form-item label="宣传内容" class="grid-content bg-purple" prop="promotionContent">
  97 + <div style="padding:20px;" v-html="secondData.promotionContent"></div>
98 98  
99 99 </el-form-item>
100 100 <!-- <el-form-item label="跳转链接" class="grid-content bg-purple" prop="eventAddrs">
... ... @@ -503,7 +503,6 @@ components: { wangEditor},
503 503 pageindex: {
504 504 pageNumber: 0,
505 505 pageSize: 10,
506   - state:'2'
507 506 },
508 507 options: [{
509 508 value: 1,
... ...
admin-web-master/src/views/promotion/contentMant.vue
  View file @cdf6c4c
... ... @@ -755,6 +755,36 @@ this.currentPage =val
755 755 }
756 756 })
757 757 },
  758 + shiyong(val,item) {
  759 + const h = this.$createElement;
  760 + this.$msgbox({
  761 + title: '消息',
  762 + message: h('p', null, [
  763 + h('span', null, '是否使用 '),
  764 + ]),
  765 + showCancelButton: true,
  766 + showClose: false,
  767 + confirmButtonText: '确定',
  768 + cancelButtonText: '取消',
  769 + customClass: 'oe-dialog-btn',
  770 + beforeClose: (action, instance, done) => {
  771 + if (action === 'confirm') {
  772 + contentEdit({
  773 + id: item.id,
  774 + draftStatus: 1,
  775 + }).then(res => {
  776 + this.getAll()
  777 + this.caogaoshow =false
  778 + done();
  779 + })
  780 + } else {
  781 + done();
  782 + }
  783 + }
  784 + })
  785 +
  786 +
  787 + },
758 788 }
759 789 }
760 790 </script>
... ...
admin-web-master/src/views/serve/Merchant/index.vue
  View file @cdf6c4c
... ... @@ -3,7 +3,7 @@
3 3 <div class="zhuti" v-if="ggXin == false && detbox==false">
4 4 <div style="height:58px;line-height:58px;">
5 5 <div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span
6   - style="color:#000000e6">商户合作</span></div>
  6 + style="color:#000000e6">商务合作</span></div>
7 7 </div>
8 8 <div>
9 9 <!-- 搜索 -->
... ... @@ -86,8 +86,9 @@
86 86 </el-table-column>
87 87 </el-table>
88 88 <div class="fenye">
89   - <el-pagination :hide-on-single-page='flag' background small size="mini" :current-page="currentPage"
90   - :page-sizes="[10, 20, 50, 100]" layout="prev, pager, next,total" :total="total "
  89 + <div>共{{total}}条</div>
  90 + <el-pagination :hide-on-single-page='flag' background :current-page="currentPage"
  91 + :page-sizes="[10, 20, 50, 100]" layout="prev, pager, next" :total="total "
91 92 @size-change="handleSizeChange" @current-change="handleCurrentChange" />
92 93 </div>
93 94 </div>
... ... @@ -773,6 +774,11 @@
773 774 </script>
774 775  
775 776 <style scoped>
  777 + .fenye {
  778 + margin-top: 20px;
  779 + display: flex;
  780 + justify-content: space-between;
  781 + }
776 782 .zhuti {
777 783 padding: 0 20px 20px 20px;
778 784 min-height: calc(100vh - 50px - 20px);
... ...
admin-web-master/src/views/serve/procedure.vue
  View file @cdf6c4c
... ... @@ -192,7 +192,9 @@
192 192 </div>
193 193 <div style="padding: 0 20px 20px 20px">
194 194 <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px">
195   - <el-form-item label="公告标题">
  195 + <el-form-item label="公告标题" prop="announcementTitle">
  196 +
  197 +
196 198 <el-input v-model="ruleForm.announcementTitle" placeholder="请输入" size="mini" />
197 199 </el-form-item>
198 200 <el-form-item label="信息类型" prop="informationType">
... ... @@ -203,7 +205,7 @@
203 205 <el-option label="活动信息" value="活动信息" />
204 206 </el-select>
205 207 </el-form-item>
206   - <el-form-item label="公告内容">
  208 + <el-form-item label="公告内容" >
207 209 <div>
208 210 <wang-editor v-model="ruleForm.announcementContent" ref="editor"></wang-editor>
209 211  
... ... @@ -216,7 +218,7 @@
216 218 style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
217 219 @click="closeFn(2)">取 消</el-button>
218 220 <el-button style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
219   - @click="addCheck('ruleForm')">确 定</el-button>
  221 + @click="addCheck">确 定</el-button>
220 222 </span>
221 223 </el-dialog>
222 224  
... ... @@ -368,7 +370,7 @@
368 370 },
369 371 // 新增确定
370 372 addCheck() {
371   - this.$refs[formName].validate((valid) => {
  373 + this.$refs.ruleForm.validate((valid) => {
372 374 if (valid) {
373 375 this.ruleForm.publisher = localStorage.getItem('roleName')
374 376 this.ruleForm.releaseTime = this.updateCurrentTime();
... ...
ceres-uniapp-master/components/canvasShow/basics/banner.vue
  View file @cdf6c4c
1 1 <template>
2 2 <div class="banner" :class="'terminal' + terminal">
3 3 <swiper class="swiper" :circular="true" :indicator-dots="false" :autoplay="true" :style="{'height':bannerHeight + 'rpx'}" @change="swiperChange">
4   - <swiper-item class="banner-item" v-for="(item,index) in bannerList" :key="index" :style="{backgroundImage: 'url('+$hostUrl+ item.imageUrl +')'}" @click="jumpLink(item.jumpUrl)">
5   - <div class="a-link" @click="jumpLink(item.jumpUrl)"><img class="img" :src=" $hostUrl+ item.imageUrl" v-show="item.imageUrl" mode="widthFix"></div>
  4 + <swiper-item class="banner-item" v-for="(item,index) in bannerList" :key="index" :style="{backgroundImage: 'url('item.imageUrl +')'}" @click="jumpLink(item.jumpUrl)">
  5 + <div class="a-link" @click="jumpLink(item.jumpUrl)"><img class="img" :src="item.imageUrl" v-show="item.imageUrl" mode="widthFix"></div>
6 6 </swiper-item>
7 7 </swiper>
8 8 <view class="swiper-dots" v-if="bannerList && bannerList.length > 1">
... ...
ceres-uniapp-master/pages_category_page1/orderModule/index.vue
  View file @cdf6c4c
... ... @@ -83,12 +83,12 @@
83 83 @click.stop="goEvaluate(skuItem,orderItem.orderId)"
84 84 >立即评价
85 85 </view>
86   - <view
  86 + <!-- <view
87 87 v-if="skuItem.commentId !== 0 && orderItem.state === 4 && orderItem.skus[0].ifAdd !== 1"
88 88 class="evaluate2"
89 89 @click.stop="goAdditionalEvaluation(orderIndex,skuItem.commentId)"
90 90 >追加评价
91   - </view>
  91 + </view> -->
92 92 </view>
93 93 </view>
94 94 </view>
... ...
ceres-uniapp-master/pages_category_page1/question/question.vue
  View file @cdf6c4c
... ... @@ -232,7 +232,9 @@
232 232 }
233 233 },
234 234 onLoad(options) {
235   -
  235 +uni.setNavigationBarTitle({
  236 + title: '问卷调查'
  237 +});
236 238 if (options.ids != '') {
237 239 if (options.src && options.token) {
238 240  
... ...
ceres-uniapp-master/pages_category_page1/question/succe.vue
  View file @cdf6c4c
... ... @@ -25,7 +25,9 @@
25 25 }
26 26 },
27 27 onLoad(options) {
28   -
  28 + uni.setNavigationBarTitle({
  29 + title: '问卷调查'
  30 + });
29 31 if (options.ids) {
30 32 this.wenjuanID = options.ids
31 33 this.yuan = true
... ...
lvdao-miniapp/pages/home/home.vue
  View file @cdf6c4c
... ... @@ -17,7 +17,7 @@
17 17 <swiper class="screen-swiper square-dot" indicator-dots="true" circular="true" autoplay="true"
18 18 interval="5000" duration="500">
19 19 <swiper-item v-for="(item,index) in swiperList" :key="index">
20   - <image :src="imgurl+item.imageUrl" mode="aspectFill"></image>
  20 + <image :src="item.imageUrl" mode="aspectFill"></image>
21 21 <!-- <video src="{{item.url}}" autoplay loop muted show-play-btn="{{false}}" controls="{{false}}" objectFit="cover" wx:if="{{item.type=='video'}}"></video> -->
22 22 </swiper-item>
23 23 </swiper>
... ...
lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
  View file @cdf6c4c
... ... @@ -29,7 +29,8 @@
29 29 </view>
30 30 <view class="form-item">
31 31 <view class="label">租金</view>
32   - <text>{{heData.contractAmount || '无'}}</text>
  32 + <text v-if="heData.contractAmount&&heData.contractAmount!=''">{{heData.contractAmount}}元</text>
  33 + <text v-else>无</text>
33 34 </view>
34 35 <view class="form-item">
35 36 <view class="label">付款日</view>
... ...
lvdao-miniapp/pagesA/projectManagement/projectDetails.vue
  View file @cdf6c4c
... ... @@ -65,7 +65,7 @@
65 65 },
66 66 pagesize: {
67 67 id: '',
68   - pageNumber: 1,
  68 + pageNumber: 0,
69 69 pageSize: 10,
70 70 },
71 71 imgurl: '',
... ...
lvdao-miniapp/utils/request.js
  View file @cdf6c4c
... ... @@ -21,10 +21,10 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
21 21 // bases = 'https://zhgw.028wlkj.com:20443/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.8:9003'+ url;
  24 + bases = 'http://128.10.249.26:9003'+ url;
25 25 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
26 26  
27   - bases = c1 + 'cdwlMall/meserver/admin-server' + url;
  27 + // bases = c1 + 'cdwlMall/meserver/admin-server' + url;
28 28  
29 29 }else if(baseUrl == 3){
30 30 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
... ...
merchant-web-master/src/utils/request.js
  View file @cdf6c4c
... ... @@ -19,8 +19,8 @@ let PREFIX;
19 19 if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'|| host == 'localhost:9530'){
20 20 // 其他情况的默认值
21 21 // PREFIX = 'http://8.130.38.56:8027/business-server';
22   - // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
23   - PREFIX = 'http://128.10.249.8:9004';
  22 + PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
  23 + // PREFIX = 'http://128.10.249.8:9004';
24 24 }else{
25 25 // PREFIX = '/merchant-business';
26 26 // PREFIX = 'http://8.130.38.56:9004';
... ...