webapp / GreenwayWeb

Commit c3662f99e09d5e18090efa226fe8e6dd9dde575c

Authored by wesley88
2 parents 8208ddf7 eaadab76

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

Inline Side-by-side
Showing 10 changed files with 101 additions and 42 deletions
admin-web-master/src/utils/request.js
  View file @c3662f9
... ... @@ -16,8 +16,8 @@ let hostall = window.location.href;
16 16 let baseURL = ''
17 17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
18 18  
19   - baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
20   - // baseURL = 'http://128.10.249.21:9003';
  19 + // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
  20 + baseURL = 'http://128.10.249.34:9003';
21 21  
22 22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
23 23 // baseURL = 'http://192.168.2.225:9003';
... ...
admin-web-master/src/views/activity/activitySp.vue
  View file @c3662f9
... ... @@ -1018,14 +1018,30 @@
1018 1018 </div>
1019 1019 </div>
1020 1020  
1021   - <div v-if="actSpye" style="padding:20px;">
  1021 + <!-- <div v-if="actSpye" style="padding:20px;">
1022 1022 <TitleWithCircle title="审核情况" style="margin-bottom:20px;" />
1023 1023 <el-radio-group v-model="liuYe">
1024 1024 <el-radio :label="1">通过</el-radio>
1025 1025 <el-radio :label="2">不通过</el-radio>
1026 1026 </el-radio-group>
1027   - </div>
1028   - </div>
  1027 + -->
  1028 + <div v-if="actSpye" style="padding:20px;">
  1029 + <TitleWithCircle title="审核情况" style="margin-bottom:20px;"/>
  1030 + <div style="padding: 20px;">
  1031 + <el-form label-width="100px" class="demo-ruleForm">
  1032 + <el-form-item label="状态" >
  1033 + <el-radio-group v-model="liuYe" style="margin-top: 14px;">
  1034 + <el-radio :label="1">通过</el-radio>
  1035 + <el-radio :label="2">不通过</el-radio>
  1036 + </el-radio-group>
  1037 + </el-form-item>
  1038 + <el-form-item label="审核意见">
  1039 + <el-input maxlength="200" show-word-limit rows="4" v-model="secondData.auditOpinion" placeholder="请输入审核意见"
  1040 + type="textarea" />
  1041 + </el-form-item>
  1042 + </el-form>
  1043 + </div>
  1044 + </div>
1029 1045 <div style="display: flex;justify-content: flex-end;padding:10px">
1030 1046 <el-button @click="refreshData" style="background-color: #3F9B6A;color: #fff">取消
1031 1047 </el-button>
... ... @@ -1033,6 +1049,7 @@
1033 1049 </el-button>
1034 1050 </div>
1035 1051 </div>
  1052 + </div>
1036 1053 </div>
1037 1054 </template>
1038 1055  
... ... @@ -1434,7 +1451,8 @@
1434 1451 if (this.liuYe == 1) {
1435 1452 xiangedit({
1436 1453 id: this.secondData.id,
1437   - state: '5'
  1454 + state: '5',
  1455 + auditOpinion:this.secondData.auditOpinion
1438 1456 }).then(res => {
1439 1457 this.$message({
1440 1458 message: '保存成功',
... ... @@ -1445,7 +1463,8 @@
1445 1463 } else {
1446 1464 xiangedit({
1447 1465 id: this.secondData.id,
1448   - state: '6'
  1466 + state: '6',
  1467 + auditOpinion:this.secondData.auditOpinion
1449 1468 }).then(res => {
1450 1469 this.$message({
1451 1470 message: '保存成功',
... ... @@ -1713,9 +1732,7 @@
1713 1732 height: 50px;
1714 1733 }
1715 1734  
1716   - /deep/ .el-form--label-top .el-form-item__label {
1717   - padding: 0;
1718   - }
  1735 +
1719 1736  
1720 1737 .pagination {
1721 1738 text-align: right;
... ... @@ -1829,11 +1846,6 @@
1829 1846 border-color: #3F9B6A
1830 1847 }
1831 1848  
1832   - ::v-deep .el-form-item__label {
1833   - font-weight: normal;
1834   - font-size: 12px;
1835   - }
1836   -
1837 1849  
1838 1850  
1839 1851 .fenlan {
... ...
admin-web-master/src/views/activity/index.vue
  View file @c3662f9
... ... @@ -2066,12 +2066,14 @@
2066 2066 }
2067 2067 this.xinlei = true
2068 2068 },
2069   - xinFenlei(node,data){
2070   - if(data){
2071   - this.xinADD.parentId = data.id
2072   - }
2073   - this.xinlei = true
2074   - },
  2069 + editFenlei(node, data) {
  2070 + this.editFen = 1
  2071 + if (data) {
  2072 + this.xinADD.parentId = data.id
  2073 + this.xinADD.classificationName = data.classificationName
  2074 + }
  2075 + this.xinlei = true
  2076 + },
2075 2077 sevLei() {
2076 2078 this.$refs.fenFrom.validate((valid) => {
2077 2079 if (valid) {
... ... @@ -2086,6 +2088,11 @@
2086 2088 parentId: '',
2087 2089 classificationType: '0'
2088 2090 }
  2091 + this.$message({
  2092 + message: '保存成功',
  2093 + type: 'success',
  2094 + offset: 100
  2095 + })
2089 2096 this.getAll()
2090 2097 })
2091 2098 } else {
... ... @@ -2100,6 +2107,11 @@
2100 2107 parentId: '',
2101 2108 classificationType: '0'
2102 2109 }
  2110 + this.$message({
  2111 + message: '保存成功',
  2112 + type: 'success',
  2113 + offset: 100
  2114 + })
2103 2115 this.getAll()
2104 2116 })
2105 2117 }
... ...
admin-web-master/src/views/atmosphere/atmosphereGl.vue
  View file @c3662f9
... ... @@ -2024,6 +2024,11 @@
2024 2024 parentId: '',
2025 2025 classificationType: '1'
2026 2026 }
  2027 + this.$message({
  2028 + message: '保存成功',
  2029 + type: 'success',
  2030 + offset: 100
  2031 + })
2027 2032 this.getAll()
2028 2033 })
2029 2034 } else {
... ... @@ -2038,6 +2043,11 @@
2038 2043 parentId: '',
2039 2044 classificationType: '1'
2040 2045 }
  2046 + this.$message({
  2047 + message: '保存成功',
  2048 + type: 'success',
  2049 + offset: 100
  2050 + })
2041 2051 this.getAll()
2042 2052 })
2043 2053 }
... ...
admin-web-master/src/views/atmosphere/atmosphereSp.vue
  View file @c3662f9
... ... @@ -1123,12 +1123,24 @@
1123 1123 </div>
1124 1124 </div>
1125 1125 <div v-if="actSpye" style="padding:20px;">
1126   - <TitleWithCircle title="审核情况" style="margin-bottom:20px;" />
1127   - <el-radio-group v-model="liuYe">
1128   - <el-radio :label="1">通过</el-radio>
1129   - <el-radio :label="2">不通过</el-radio>
1130   - </el-radio-group>
1131   - </div>
  1126 + <TitleWithCircle title="审核情况" style="margin-bottom:20px;"/>
  1127 + <div style="padding: 20px;">
  1128 + <el-form label-width="100px" class="demo-ruleForm">
  1129 + <el-form-item label="状态" >
  1130 + <el-radio-group v-model="liuYe" style="margin-top: 14px;">
  1131 + <el-radio :label="1">通过</el-radio>
  1132 + <el-radio :label="2">不通过</el-radio>
  1133 + </el-radio-group>
  1134 + </el-form-item>
  1135 + <el-form-item label="审核意见">
  1136 + <el-input maxlength="200" show-word-limit rows="4" v-model="secondData.auditOpinion" placeholder="请输入审核意见"
  1137 + type="textarea" />
  1138 + </el-form-item>
  1139 + </el-form>
  1140 + </div>
  1141 + </div>
  1142 +
  1143 +
1132 1144 </div>
1133 1145 <div style="display: flex;justify-content: flex-end;padding:10px">
1134 1146 <el-button @click="refreshData" style="background-color: #3F9B6A;color: #fff">取消
... ... @@ -1508,7 +1520,7 @@
1508 1520 },
1509 1521 OAshen(){
1510 1522 if(this.liuYe == 1){
1511   - xiangedit({id:this.secondData.id,state:'5'}).then(res=>{
  1523 + xiangedit({id:this.secondData.id,state:'5',auditOpinion:this.secondData.auditOpinion}).then(res=>{
1512 1524 this.$message({
1513 1525 message: '保存成功',
1514 1526 type: 'success'
... ... @@ -1516,7 +1528,7 @@
1516 1528 this.getAll()
1517 1529 })
1518 1530 }else{
1519   - xiangedit({id:this.secondData.id,state:'6'}).then(res=>{
  1531 + xiangedit({id:this.secondData.id,state:'6',auditOpinion:this.secondData.auditOpinion}).then(res=>{
1520 1532 this.$message({
1521 1533 message: '保存成功',
1522 1534 type: 'success'
... ... @@ -1766,9 +1778,6 @@
1766 1778 height: 50px;
1767 1779 }
1768 1780  
1769   - /deep/ .el-form--label-top .el-form-item__label {
1770   - padding: 0;
1771   - }
1772 1781  
1773 1782 .pagination {
1774 1783 text-align: right;
... ... @@ -1877,10 +1886,6 @@
1877 1886 border-color: #3F9B6A
1878 1887 }
1879 1888  
1880   - ::v-deep .el-form-item__label {
1881   - font-weight: normal;
1882   - font-size: 12px;
1883   - }
1884 1889  
1885 1890  
1886 1891  
... ...
admin-web-master/src/views/media/mediaMana.vue
  View file @c3662f9
... ... @@ -968,6 +968,11 @@ this.$refs.mulTable.clearSelection(); // 清除所有选项
968 968 parentId: '',
969 969 classificationType: '3'
970 970 }
  971 + this.$message({
  972 + message: '保存成功',
  973 + type: 'success',
  974 + offset: 100
  975 + })
971 976 this.getAll()
972 977 })
973 978 } else {
... ... @@ -982,6 +987,11 @@ this.$refs.mulTable.clearSelection(); // 清除所有选项
982 987 parentId: '',
983 988 classificationType: '3'
984 989 }
  990 + this.$message({
  991 + message: '保存成功',
  992 + type: 'success',
  993 + offset: 100
  994 + })
985 995 this.getAll()
986 996 })
987 997 }
... ...
admin-web-master/src/views/promotion/account.vue
  View file @c3662f9
... ... @@ -613,6 +613,11 @@ this.currentPage = val
613 613 parentId: '',
614 614 classificationType: '2'
615 615 }
  616 + this.$message({
  617 + message: '保存成功',
  618 + type: 'success',
  619 + offset: 100
  620 + })
616 621 this.getAll()
617 622 })
618 623 } else {
... ... @@ -627,6 +632,11 @@ this.currentPage = val
627 632 parentId: '',
628 633 classificationType: '2'
629 634 }
  635 + this.$message({
  636 + message: '保存成功',
  637 + type: 'success',
  638 + offset: 100
  639 + })
630 640 this.getAll()
631 641 })
632 642 }
... ...
admin-web-master/src/views/promotion/audit.vue
  View file @c3662f9
... ... @@ -105,7 +105,7 @@
105 105 </div>
106 106 </el-form-item>
107 107 <el-form-item label="审核意见" class="grid-content bg-purple" >
108   - <el-input type="textarea" v-model="secondData.auditOpinion" v-if='wangShow==false'></el-input>
  108 + <el-input maxlength="200" show-word-limit rows="4" placeholder="请输入审核意见" type="textarea" v-model="secondData.auditOpinion" v-if='wangShow==false'></el-input>
109 109 <div style="padding:20px;" v-else>{{secondData.auditOpinion}}</div>
110 110 </el-form-item>
111 111 </el-form>
... ...
lvdao-miniapp/main.js
  View file @c3662f9
... ... @@ -8,13 +8,13 @@ import uView from &quot;uview-ui&quot;;
8 8 import DialogBox from './components/DialogBox/DialogBox';
9 9 // let hostall = window.location.href;
10 10 // let c1 = hostall.split('cdwlMall')[0];
11   -// let c1 = 'https://jy.scjysm.asia:18086/'
12   -let c1 = 'https://zhgw-uat.028wlkj.com/'
  11 +let c1 = 'https://jy.scjysm.asia:18086/'
  12 +// let c1 = 'https://zhgw-uat.028wlkj.com/'
13 13 Vue.config.productionTip = false
14 14 Vue.prototype.$http = http
15 15 Vue.prototype.$imgUrl = (url) => {
16   - // return (c1 + "cdwlMall/questionnaire/file/static" + url);
17   - return (c1 + "cdwlMall/zsfwzxt/test/file/static" + url);
  16 + return (c1 + "cdwlMall/questionnaire/file/static" + url);
  17 + // return (c1 + "cdwlMall/zsfwzxt/test/file/static" + url);
18 18 }
19 19 Vue.prototype.$img = c1+ 'cdwlMall'
20 20 // Vue.prototype.$upload = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server/miniio/upload"
... ...
lvdao-miniapp/manifest.json
  View file @c3662f9
1 1 {
2 2 "name" : "绿道",
3   - "appid" : "__UNI__189D96A",
  3 + "appid" : "__UNI__F034047",
4 4 "description" : "",
5 5 "versionName" : "1.0.2",
6 6 "versionCode" : "100",
... ...