webapp / GreenwayWeb

Commit a18f16a903643db5bf779d714d8d3e2d1c38a597

Authored by 杨鑫
1 parent 3963f882

提交1

Inline Side-by-side
Showing 27 changed files with 163 additions and 90 deletions
admin-web-master/src/utils/request.js
  View file @a18f16a
... ... @@ -16,13 +16,13 @@ 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';
  19 + // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
20 20 // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
21 21  
22 22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
23 23  
24 24  
25   - // baseURL = 'http://128.10.249.26:9003';
  25 + baseURL = 'http://128.10.249.39:9003';
26 26  
27 27  
28 28 } else {
... ...
admin-web-master/src/utils/request2.js
  View file @a18f16a
... ... @@ -17,10 +17,10 @@ let baseURL = ''
17 17 // || host === 'localhost:9528'
18 18 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
19 19 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
20   - baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server';
  20 + // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server';
21 21 // baseURL = 'http://172.16.61.125:9004';
22 22 // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
23   - // baseURL = 'http://128.10.249.20:9004';
  23 + baseURL = 'http://128.10.249.39:9004';
24 24 } else {
25 25 console.error('---------------------')
26 26 console.error(hostall)
... ...
admin-web-master/src/views/activity/activityHis.vue
  View file @a18f16a
... ... @@ -580,13 +580,13 @@
580 580 活动名称
581 581 </template>
582 582  
583   - <span>{{duibiList.planName}}</span>
  583 + <span>{{duibiList.planName || ''}}</span>
584 584 </el-descriptions-item>
585 585 <el-descriptions-item>
586 586 <template slot="label">
587 587 实际举办地点
588 588 </template>
589   - <span>{{duibiList.eventAddrs}}</span>
  589 + <span>{{duibiList.eventAddrs || ''}}</span>
590 590 </el-descriptions-item>
591 591 <el-descriptions-item>
592 592 <template slot="label">
... ... @@ -741,7 +741,44 @@
741 741  
742 742 </div>
743 743 </div>
744   -
  744 + <div style="width: 100%;">
  745 +
  746 + <div style="padding:10px 20px;">
  747 + <el-descriptions class="margin-top" title="系统信息" :column="2" border
  748 + :labelStyle="labelStyle" :contentStyle="contentStyle">
  749 + <el-descriptions-item>
  750 + <template slot="label">
  751 + 创建人
  752 + </template>
  753 + <span>{{duibiList.createUser}}</span>
  754 +
  755 + </el-descriptions-item>
  756 + <el-descriptions-item>
  757 + <template slot="label">
  758 + 创建时间
  759 + </template>
  760 + <span>{{duibiList.createDate}}</span>
  761 +
  762 + </el-descriptions-item>
  763 + <el-descriptions-item>
  764 + <template slot="label">
  765 + 更新人
  766 + </template>
  767 + <span>{{duibiList.updateUser}}</span>
  768 +
  769 + </el-descriptions-item>
  770 + <el-descriptions-item>
  771 + <template slot="label">
  772 + 更新时间
  773 + </template>
  774 + <span>{{duibiList.updateDate}}</span>
  775 +
  776 + </el-descriptions-item>
  777 +
  778 + </el-descriptions>
  779 +
  780 + </div>
  781 + </div>
745 782  
746 783 </div>
747 784 </div>
... ... @@ -768,8 +805,8 @@
768 805 <el-button @click="bianji" style="background-color: #3F9B6A;color: #fff"
769 806 v-if="zhixingBian && activeName=='second'">保存
770 807 </el-button>
771   - <el-button @click="fivebian" style="background-color: #3F9B6A;color: #fff" v-if="activeName=='five'">保存
772   - </el-button>
  808 + <!-- <el-button @click="fivebian" style="background-color: #3F9B6A;color: #fff" v-if="activeName=='five'">保存
  809 + </el-button> -->
773 810  
774 811 </div>
775 812 </div>
... ... @@ -1229,7 +1266,7 @@
1229 1266 <div
1230 1267 style="display:flex;width:100%;justify-content: center;border: 1px solid #DEDEDE;border-radius: 5px;padding: 0px 10px;">
1231 1268 <div style="width: 38%;">
1232   - <div style="color:#3F9B6A;text-align: center;padding: 10px 0;">实际成本</div>
  1269 + <div style="color:#3F9B6A;text-align: center;padding: 10px 0;">预估成本</div>
1233 1270 <div
1234 1271 style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
1235 1272 <div>内部人力</div>
... ... @@ -1938,6 +1975,10 @@
1938 1975 this.tableData = res.data.content
1939 1976 },
1940 1977 formatTimestampToDate(timestamp) {
  1978 + console.log(timestamp,'timestamp')
  1979 + if(timestamp == undefined ){
  1980 + return ''
  1981 + }
1941 1982 const date = new Date(timestamp);
1942 1983 const year = date.getFullYear();
1943 1984 const month = String(date.getMonth() + 1).padStart(2, '0');
... ... @@ -1945,7 +1986,7 @@
1945 1986 const hours = String(date.getHours()).padStart(2, '0');
1946 1987 const minutes = String(date.getMinutes()).padStart(2, '0');
1947 1988 const seconds = String(date.getSeconds()).padStart(2, '0');
1948   - return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
  1989 + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
1949 1990 },
1950 1991 //重置按钮
1951 1992 resetting() {
... ... @@ -1987,10 +2028,10 @@
1987 2028 }).then(res => {
1988 2029 this.effectivenessList = res.data
1989 2030 // let actName = this.effectivenessList.operationType.split('')
1990   - this.effectivenessList.map((item, index) => {
1991   - let actName = item.operationType.split(' ')
1992   - this.effectivenessList[index].operationType = actName[0]
1993   - })
  2031 + // this.effectivenessList.map((item, index) => {
  2032 + // let actName = item.operationType.split(' ')
  2033 + // this.effectivenessList[index].operationType = actName[0]
  2034 + // })
1994 2035 // console.log(this.effectivenessList.operationType,'actName')
1995 2036 // this.effectivenessList.operationType = actName[0]
1996 2037 })
... ... @@ -2026,7 +2067,7 @@
2026 2067 } //执行效果列表
2027 2068 actPage({
2028 2069 detailsId: item.id,
2029   - pageNumber: 1,
  2070 + pageNumber: 0,
2030 2071 pageSize: 10,
2031 2072 }).then(res => {
2032 2073 console.log(res.data.content)
... ... @@ -2172,7 +2213,7 @@
2172 2213 const minutes = now.getMinutes().toString().padStart(2, '0');
2173 2214 const seconds = now.getSeconds().toString().padStart(2, '0');
2174 2215  
2175   - return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
  2216 + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
2176 2217 },
2177 2218  
2178 2219 handleCurrentChange(val) {
... ... @@ -2301,7 +2342,7 @@
2301 2342 let that = this
2302 2343 actPage({
2303 2344 detailsId: this.multipleSelection[0].id,
2304   - pageNumber: 1,
  2345 + pageNumber: 0,
2305 2346 pageSize: 10,
2306 2347 }).then(res => {
2307 2348 this.duibiTwo = res.data.content[0] === undefined ? {} : res.data.content[0];
... ... @@ -2360,7 +2401,7 @@ this.ListOne = item.planName
2360 2401  
2361 2402 // actPage({
2362 2403 // detailsId: item.id,
2363   - // pageNumber: 1,
  2404 + // pageNumber: 0,
2364 2405 // pageSize: 10,
2365 2406 // }).then(res => {
2366 2407 // this.duibiTwo = res.data.content[0] === undefined ? {} : res.data.content[0];
... ... @@ -2548,7 +2589,7 @@ this.ListOne = item.planName
2548 2589 // this.lishiList = e
2549 2590 let msg = this.effectivenessList[e]
2550 2591 // this.duibiList = JSON.parse(msg.modifyContent)
2551   -
  2592 +
2552 2593 this.duibiList = JSON.parse(msg.modifiedData)
2553 2594  
2554 2595 },
... ... @@ -2756,6 +2797,7 @@ this.ListOne = item.planName
2756 2797 this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
2757 2798 this.zhixingList.detailsId = this.secondData.id
2758 2799 this.zhixingList.createDate = this.updateCurrentTime()
  2800 + this.zhixingList.createUser = localStorage.getItem('roleName')
2759 2801 actAdd(this.zhixingList).then(res => {
2760 2802 for (let i = 0; i < this.tableDa.length; i++) {
2761 2803 this.tableDa[i].detailsId = res.data.id
... ... @@ -2772,7 +2814,9 @@ this.ListOne = item.planName
2772 2814 this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
2773 2815 this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
2774 2816 Vue.delete(that.zhixingList, 'planTime')
2775   - this.zhixingList.updateDate = ''
  2817 + // this.zhixingList.updateDate = ''
  2818 + this.zhixingList.updateDate = this.updateCurrentTime()
  2819 + this.zhixingList.updateUser = localStorage.getItem('roleName')
2776 2820 actEdit(this.zhixingList).then(() => {
2777 2821 this.ggXin = false
2778 2822 this.getAll()
... ...
admin-web-master/src/views/activity/activitySp.vue
  View file @a18f16a
... ... @@ -1524,7 +1524,7 @@
1524 1524 } //执行效果列表
1525 1525 actPage({
1526 1526 detailsId: item.id,
1527   - pageNumber: 1,
  1527 + pageNumber: 0,
1528 1528 pageSize: 10,
1529 1529 }).then(res => {
1530 1530 console.log(res.data.content)
... ...
admin-web-master/src/views/activity/index.vue
  View file @a18f16a
... ... @@ -1503,7 +1503,7 @@
1503 1503 } //执行效果列表
1504 1504 actPage({
1505 1505 detailsId: item.id,
1506   - pageNumber: 1,
  1506 + pageNumber: 0,
1507 1507 pageSize: 10,
1508 1508 }).then(res => {
1509 1509 console.log(res.data.content)
... ... @@ -1671,14 +1671,17 @@
1671 1671 this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
1672 1672 this.zhixingList.detailsId = this.secondData.id
1673 1673 this.zhixingList.createDate = this.updateCurrentTime()
  1674 + this.zhixingList.createUser = localStorage.getItem('roleName')
1674 1675 actAdd(this.zhixingList).then(res => {
1675 1676 for (let i = 0; i < this.tableDa.length; i++) {
1676 1677 this.tableDa[i].detailsId = res.data.id
1677 1678 MingAdd(this.tableDa[i]).then(res => {
1678   - this.ggXin = false
1679   - this.getAll()
  1679 +
1680 1680 })
1681 1681 }
  1682 + this.ggXin = false
  1683 + this.zhixingBian = false
  1684 + this.getAll()
1682 1685 })
1683 1686  
1684 1687 } else {
... ... @@ -1687,9 +1690,11 @@
1687 1690 this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
1688 1691 this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
1689 1692 Vue.delete(that.zhixingList, 'planTime')
1690   - this.zhixingList.updateDate = ''
  1693 + this.zhixingList.updateDate = this.updateCurrentTime()
  1694 + this.zhixingList.updateUser = localStorage.getItem('roleName')
1691 1695 actEdit(this.zhixingList).then(()=>{
1692 1696 this.ggXin = false
  1697 + this.zhixingBian = false
1693 1698 this.getAll()
1694 1699 })
1695 1700 }
... ... @@ -1870,7 +1875,7 @@
1870 1875 let that = this
1871 1876 actPage({
1872 1877 detailsId: this.multipleSelection[0].id,
1873   - pageNumber: 1,
  1878 + pageNumber: 0,
1874 1879 pageSize: 10,
1875 1880 }).then(res => {
1876 1881 this.duibiTwo = res.data.content[0] === undefined ? {} : res.data.content[0];
... ... @@ -2323,13 +2328,13 @@
2323 2328 const pdf = new jsPDF('p', 'mm', 'a4');
2324 2329  
2325 2330 // 添加图像到 PDF，第二个参数是图像格式，第三个参数是缩放比例
2326   - const imgWidth = 190; // 图像的宽度（mm）
2327   - const imgHeight = (canvas.height * imgWidth) / canvas.width; // 保持图像的宽高比
  2331 + const imgWidth = 190 // 图像的宽度（mm）
  2332 + const imgHeight = (canvas.height * imgWidth) / canvas.width // 保持图像的宽高比
2328 2333  
2329   - pdf.addImage(imgData, 'PNG', 10, 10, imgWidth, imgHeight); // 10, 10 是图像在 PDF 中的位置（mm）
  2334 + pdf.addImage(imgData, 'PNG', 10, 10, imgWidth, imgHeight) // 10, 10 是图像在 PDF 中的位置（mm）
2330 2335  
2331 2336 // 保存 PDF 文件
2332   - pdf.save('活动方案.pdf');
  2337 + pdf.save('活动方案.pdf')
2333 2338 },
2334 2339 peizhi(item) {
2335 2340 this.peiForm = {
... ...
admin-web-master/src/views/atmosphere/atmosphereGl.vue
  View file @a18f16a
... ... @@ -1553,9 +1553,10 @@
1553 1553 this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
1554 1554 this.zhixingList.detailsId = this.secondData.id
1555 1555 this.zhixingList.createDate = this.updateCurrentTime()
  1556 + this.zhixingList.createUser = localStorage.getItem('roleName')
1556 1557 actAdd(this.zhixingList).then(()=>{
1557   - this.ggXin = false
1558   - this.getAll()
  1558 + this.ggXin = false
  1559 + this.getAll()
1559 1560 })
1560 1561 } else {
1561 1562 let that = this
... ... @@ -1563,7 +1564,8 @@
1563 1564 this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
1564 1565 this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
1565 1566 Vue.delete(that.zhixingList, 'planTime')
1566   - this.zhixingList.updateDate = ''
  1567 + this.zhixingList.updateDate = this.updateCurrentTime()
  1568 + this.zhixingList.updateUser = localStorage.getItem('roleName')
1567 1569 actEdit(this.zhixingList).then(()=>{
1568 1570 this.ggXin = false
1569 1571 this.getAll()
... ... @@ -1612,7 +1614,7 @@
1612 1614 } //执行效果列表
1613 1615 actPage({
1614 1616 detailsId: item.id,
1615   - pageNumber: 1,
  1617 + pageNumber: 0,
1616 1618 pageSize: 10,
1617 1619 }).then(res => {
1618 1620 console.log(res.data.content)
... ... @@ -2167,7 +2169,7 @@
2167 2169 let that = this
2168 2170 actPage({
2169 2171 detailsId: this.multipleSelection[0].id,
2170   - pageNumber: 1,
  2172 + pageNumber: 0,
2171 2173 pageSize: 10,
2172 2174 }).then(res => {
2173 2175 this.duibiTwo = res.data.content[0] === undefined ? {} : res.data.content[0];
... ...
admin-web-master/src/views/atmosphere/atmosphereHis.vue
  View file @a18f16a
... ... @@ -1225,7 +1225,7 @@
1225 1225 <div
1226 1226 style="display:flex;width:100%;justify-content: center;border: 1px solid #DEDEDE;border-radius: 5px;padding: 0px 10px;">
1227 1227 <div style="width: 38%;">
1228   - <div style="color:#3F9B6A;text-align: center;padding: 10px 0;">实际成本</div>
  1228 + <div style="color:#3F9B6A;text-align: center;padding: 10px 0;">预估成本</div>
1229 1229 <div
1230 1230 style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
1231 1231 <div>内部人力</div>
... ... @@ -1972,10 +1972,10 @@
1972 1972 activityEffectivenessId: item.id
1973 1973 }).then(res => {
1974 1974 this.effectivenessList = res.data
1975   - this.effectivenessList.map((item, index) => {
1976   - let actName = item.operationType.split(' ')
1977   - this.effectivenessList[index].operationType = actName[0]
1978   - })
  1975 + // this.effectivenessList.map((item, index) => {
  1976 + // let actName = item.operationType.split(' ')
  1977 + // this.effectivenessList[index].operationType = actName[0]
  1978 + // })
1979 1979 })
1980 1980 this.liData = []
1981 1981 this.lixiang = {}
... ... @@ -2006,7 +2006,7 @@
2006 2006 } //执行效果列表
2007 2007 actPage({
2008 2008 detailsId: item.id,
2009   - pageNumber: 1,
  2009 + pageNumber: 0,
2010 2010 pageSize: 10,
2011 2011 }).then(res => {
2012 2012 console.log(res.data.content)
... ... @@ -2281,7 +2281,7 @@
2281 2281 let that = this
2282 2282 actPage({
2283 2283 detailsId: this.multipleSelection[0].id,
2284   - pageNumber: 1,
  2284 + pageNumber: 0,
2285 2285 pageSize: 10,
2286 2286 }).then(res => {
2287 2287 this.duibiTwo = res.data.content[0] === undefined ? {} : res.data.content[0];
... ... @@ -2343,7 +2343,7 @@ this.ListOne = item.planName
2343 2343 // let that = this
2344 2344 // actPage({
2345 2345 // detailsId: item.id,
2346   - // pageNumber: 1,
  2346 + // pageNumber: 0,
2347 2347 // pageSize: 10,
2348 2348 // }).then(res => {
2349 2349 // this.duibiTwo = res.data.content[0] === undefined ? {} : res.data.content[0];
... ... @@ -2736,6 +2736,7 @@ this.ListOne = item.planName
2736 2736 this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
2737 2737 this.zhixingList.detailsId = this.secondData.id
2738 2738 this.zhixingList.createDate = this.updateCurrentTime()
  2739 + this.zhixingList.createUser = localStorage.getItem('roleName')
2739 2740 actAdd(this.zhixingList).then(() => {
2740 2741 this.ggXin = false
2741 2742 this.getAll()
... ... @@ -2746,7 +2747,8 @@ this.ListOne = item.planName
2746 2747 this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
2747 2748 this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
2748 2749 Vue.delete(that.zhixingList, 'planTime')
2749   - this.zhixingList.updateDate = ''
  2750 + this.zhixingList.updateDate = this.updateCurrentTime()
  2751 + this.zhixingList.updateUser = localStorage.getItem('roleName')
2750 2752 actEdit(this.zhixingList).then(() => {
2751 2753 this.ggXin = false
2752 2754 this.getAll()
... ...
admin-web-master/src/views/atmosphere/atmosphereSp.vue
  View file @a18f16a
... ... @@ -1575,7 +1575,7 @@
1575 1575 }//执行效果列表
1576 1576 actPage({
1577 1577 detailsId:item.id,
1578   - pageNumber: 1,
  1578 + pageNumber: 0,
1579 1579 pageSize: 10,
1580 1580 }).then(res=>{
1581 1581 console.log(res.data.content)
... ...
admin-web-master/src/views/online/summaryQuery/index.vue
  View file @a18f16a
... ... @@ -124,7 +124,7 @@
124 124 >
125 125 </el-table-column>
126 126  
127   - <el-table-column
  127 + <!-- <el-table-column
128 128 label="营业期间"
129 129 prop=""
130 130 width="auto"
... ... @@ -133,7 +133,7 @@
133 133 <template slot-scope="scope">
134 134 {{scope.row.businessStartDate}}-{{scope.row.businessEndDate}}
135 135 </template>
136   - </el-table-column>
  136 + </el-table-column> -->
137 137 <el-table-column
138 138 label="营业额(元)"
139 139 prop="price"
... ...
admin-web-master/src/views/order/ordersel/index.vue
  View file @a18f16a
... ... @@ -89,7 +89,10 @@
89 89 <span v-if="scope.row.state == 2" >待发货</span>
90 90 <span v-if="scope.row.state == 3" >已发货</span>
91 91 <span v-if="scope.row.state == 4" >已完成</span>
92   - <span v-if="scope.row.state == 5" >已关闭</span>
  92 + <span v-if="scope.row.state == 5">已关闭</span>
  93 + <span v-if="scope.row.state == 6">待成团</span>
  94 + <span v-if="scope.row.state == 7">待售后</span>
  95 + <span v-if="scope.row.state == 8">已退款</span>
93 96 </template>
94 97 </el-table-column>
95 98  
... ...
admin-web-master/src/views/order/ordersel/pendDetails.vue
  View file @a18f16a
... ... @@ -27,6 +27,9 @@
27 27 <span v-if="order.state === 3">待收货</span>
28 28 <span v-if="order.state === 4">已完成</span>
29 29 <span v-if="order.state === 5">已取消</span>
  30 + <span v-if="order.state == 6">待成团</span>
  31 + <span v-if="order.state == 7">待售后</span>
  32 + <span v-if="order.state == 8">已退款</span>
30 33 </p>
31 34 <p>
32 35 <span>售后状态:</span>
... ...
admin-web-master/src/views/renovation/commoditySystem/addCommodity.vue
  View file @a18f16a
... ... @@ -15,7 +15,7 @@
15 15 <el-row class="detail-box">
16 16 <el-col :span="12">
17 17 <div>商品名称：{{ productItem.productName }}</div>
18   - <div>商品卖点：{{ productItem.productBrief }}</div>
  18 + <div style="padding:0 10px 0 0;white-space: nowrap; overflow: hidden;text-overflow: ellipsis;">商品卖点：{{ productItem.productBrief }}</div>
19 19 <div>
20 20 商品图片：
21 21 <div >
... ...
admin-web-master/src/views/serve/salesReport.vue
  View file @a18f16a
... ... @@ -58,13 +58,14 @@
58 58 tooltip-effect="dark"
59 59  
60 60 >
61   - <el-table-column label="序号" width="150">
  61 + <el-table-column label="序号" width="50">
62 62 <template slot-scope="scope">{{ scope.$index +1 }}</template>
63 63 </el-table-column>
64 64 <el-table-column prop="productName" label="商品名称" width="180" />
65 65 <el-table-column prop="brand" label="品牌" width="180" show-overflow-tooltip />
66 66 <el-table-column prop="productType" label="商品类型" show-overflow-tooltip />
67 67 <el-table-column prop="price" label="单价" show-overflow-tooltip />
  68 + <el-table-column prop="salesQuantity" label="销售数量" show-overflow-tooltip />
68 69 <el-table-column prop="saleTime" label="销售时间" show-overflow-tooltip />
69 70 <el-table-column prop="merchantId" label="上报人" show-overflow-tooltip />
70 71 <!-- <el-table-column label="操作" fixed="right">
... ...
ceres-uniapp-master/components/canvasShow/basics/product/app/index.vue
  View file @a18f16a
... ... @@ -290,7 +290,7 @@
290 290 gonggao(item){
291 291 const items = JSON.stringify(item)
292 292 uni.navigateTo({
293   - url: `/pages_category_page1/procedure/procedure?item=${items}`
  293 + url: `/pages_category_page1/procedure/procedure?item=${encodeURIComponent(items)}`
294 294 })
295 295 },
296 296 swiperChange(e) {
... ...
ceres-uniapp-master/config/api.js
  View file @a18f16a
1 1  
2 2 // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
3 3 // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
4   -const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
5   -const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
6   -const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
7   -// const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
8   -// const DOMAIN_PREFIXPING = 'http://128.10.249.8:9003'
9   -// const DOMAIN_PREFIX = 'http://128.10.249.8:9007'
  4 +// const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
  5 +// const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
  6 +// const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
  7 +const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
  8 +const DOMAIN_PREFIXPING = 'http://128.10.249.39:9003'
  9 +const DOMAIN_PREFIX = 'http://128.10.249.39:9007'
10 10 // const host = `${window.location.protocol}//${window.location.host}`
11 11 // const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
12 12 // const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api`
... ...
ceres-uniapp-master/pages_category_page1/goodsModule/evaSuccessful.vue
  View file @a18f16a
... ... @@ -35,7 +35,7 @@ export default {
35 35 methods: {
36 36 goToOrder() {
37 37 uni.navigateTo({
38   - url: '/pages_category_page1/orderModule/index'
  38 + url: '/pages_category_page1/orderModule/index?all=1'
39 39 })
40 40 },
41 41 goToHome() {
... ...
ceres-uniapp-master/pages_category_page1/orderModule/index.vue
  View file @a18f16a
... ... @@ -180,7 +180,7 @@ export default {
180 180 paymentState:'1',
181 181 page: 1,
182 182 pageSize: 20,
183   - list: [{}, {}, {}, {}, {}, {}],
  183 + list: [],
184 184 listTotal: 0, // 用户订单总数
185 185 isEmpty: false, // 列表是否为空
186 186 tabList: orderTabList, // 顶部tabs
... ... @@ -201,7 +201,9 @@ export default {
201 201 }else{
202 202 this.orderState = ''
203 203 }
204   - this.handleGetOrderList()
  204 + if(options.all == '1'){
  205 + this.handleGetOrderList()
  206 + }
205 207 },
206 208 onShow() {
207 209 // #ifdef H5
... ...
ceres-uniapp-master/pages_category_page1/orderModule/orderConfirm.vue
  View file @a18f16a
... ... @@ -1379,6 +1379,7 @@
1379 1379 data.shops.push(shopsobj)
1380 1380 data.shops[n].distribution.distributionPrice = this.settlement.shops[n].distribution.distributionPrice
1381 1381 data.shops[n].distribution.distributionName = this.settlement.shops[n].distribution.distributionName
  1382 + data.shops[n].distribution.logisticsId = this.settlement.shops[n].distribution.logisticsId
1382 1383 let dataskuslen = this.settlement.shops[n].skus.length
1383 1384 for (let m = 0; m < dataskuslen; m++) {
1384 1385 let skusobj = {}
... ...
ceres-uniapp-master/pages_category_page1/question/question.vue
  View file @a18f16a
... ... @@ -118,11 +118,11 @@
118 118 <u-input v-model="model1.name" placeholder="请输入姓名"></u-input>
119 119 </u-form-item>
120 120 <u-form-item label="电话" prop="phone" borderBottom v-if="wenjuan.needPhone == '必填'"
121   - style="padding: 0 20px;">
  121 + style="padding: 10px 20px;">
122 122 <u-input v-model="model1.phone" :maxlength="11" placeholder="请输入电话"></u-input>
123 123 </u-form-item>
124 124 <u-form-item label="性别" prop="sexl" borderBottom v-if="wenjuan.needGender == '必填'"
125   - style="padding: 0 20px ;">
  125 + style="padding: 10px 20px;">
126 126 <!-- <u-input v-model="model1.sexl" placeholder="请输入性别"></u-input> -->
127 127 <u-radio-group v-model="model1.sexl">
128 128 <u-radio active-color="#0FBB59" @change="radioChange" v-for="(item, index) in SexList"
... ...
lvdao-miniapp/pages/activityDetail/activityDetail.vue
  View file @a18f16a
... ... @@ -81,7 +81,7 @@ export default {
81 81 // 使用 slice() 或 substring() 去除两端的单引号
82 82 let value = valueWithQuotes.slice(1, -1);
83 83 this.pagesize.id = value
84   - console.log('olo',value)
  84 +
85 85 }else{
86 86 this.pagesize.id = option.item
87 87  
... ... @@ -135,15 +135,13 @@ export default {
135 135 this.form.activityApplicationId = this.tableData.id
136 136 this.form.signUpTime = this.getCurrentDateTime()
137 137 this.$http.sendRequest('/cereActivityApplicationSignUp/insert', 'POST',this.form,1).then(res => {
138   - console.log('res',res.data)
  138 +
139 139 if(res.data.code == '200'){
140   - setTimeout(()=>{
141   - uni.switchTab({
142   - url: '/pages/home/home'
143   - })
144   - },1000)
145   - }else{
146   -
  140 + uni.showToast({
  141 + icon: 'none',
  142 + title: '报名成功'
  143 + })
  144 +
147 145 }
148 146 // uni.showToast({
149 147 // title: res.data.data,
... ... @@ -159,6 +157,8 @@ export default {
159 157 // })
160 158 })
161 159 this.joinShow = false
  160 + this.form.signUpName = ''
  161 + this.form.signUpPhone = ''
162 162  
163 163  
164 164 },
... ...
lvdao-miniapp/pages/home/home.vue
  View file @a18f16a
... ... @@ -696,9 +696,16 @@
696 696  
697 697 },
698 698 wuye() {
699   - uni.navigateTo({
700   - url: `/pagesA/weball/web?url=https://zhgw-uat.028wlkj.com/cdwlMall/meh5/`
701   - })
  699 + if(uni.getStorageSync('user').phone&&uni.getStorageSync('user').phone != ''){
  700 + uni.navigateTo({
  701 + url: `/pagesA/weball/web?url=https://zhgw-uat.028wlkj.com/cdwlMall/meh5/?phone=${uni.getStorageSync('user').phone}`
  702 + })
  703 + }else{
  704 + uni.navigateTo({
  705 + url: `/pagesA/weball/web?url=https://zhgw-uat.028wlkj.com/cdwlMall/meh5/`
  706 + })
  707 + }
  708 +
702 709 // if(uni.getStorageSync('user').phone&& uni.getStorageSync('user').phone!=''){
703 710 // uni.navigateTo({
704 711 // url: `/pages/propertyPay/propertyPayList/propertyPayList`
... ...
lvdao-miniapp/pages/procedure/procedure.vue
  View file @a18f16a
... ... @@ -23,9 +23,9 @@
23 23 };
24 24 },
25 25 onLoad(option){
26   - console.error(option.item)
27   - // console.error(JSON.parse(decodeURI(option.item)))
28   - this.tableList = uni.getStorageSync('gghd')
  26 + this.tableList = JSON.parse(decodeURIComponent(option.item))
  27 + // console.error()
  28 + // this.tableList = uni.getStorageSync('gghd')
29 29 },
30 30 mounted(){
31 31  
... ...
lvdao-miniapp/utils/request.js
  View file @a18f16a
... ... @@ -21,17 +21,17 @@ 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.20:9003'+ url;
  24 + bases = 'http://128.10.249.39: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;
31 31 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url;
32 32 // bases = 'http://128.10.249.22:9003:9007' + url;
33   - // bases = 'http://128.10.249.20:9007' + url;
34   - bases = c1 + 'cdwlMall/meserver/api' + url;
  33 + bases = 'http://128.10.249.39:9007' + url;
  34 + // bases = c1 + 'cdwlMall/meserver/api' + url;
35 35  
36 36 }else{
37 37 // bases = 'http://128.10.249.22:9004' + url;
... ... @@ -39,9 +39,9 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
39 39 // bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
40 40 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
41 41 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url;
42   - // bases = 'http://128.10.249.20:9004' + url;
  42 + bases = 'http://128.10.249.39:9004' + url;
43 43 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
44   - bases = c1 + 'cdwlMall/business-server' + url;
  44 + // bases = c1 + 'cdwlMall/business-server' + url;
45 45  
46 46 }
47 47 var token = uni.getStorageSync('token') || '';
... ...
merchant-web-master/src/utils/request.js
  View file @a18f16a
... ... @@ -20,8 +20,8 @@ let PREFIX;
20 20 // 其他情况的默认值
21 21 // PREFIX = 'http://8.130.38.56:8027/business-server';
22 22 // PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server';
23   - PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
24   - // PREFIX = 'http://128.10.249.8:9004';
  23 + // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
  24 + PREFIX = 'http://128.10.249.39:9004';
25 25 }else{
26 26 // PREFIX = '/merchant-business';
27 27 // PREFIX = 'http://8.130.38.56:9004';
... ...
merchant-web-master/src/utils/request2.js
  View file @a18f16a
... ... @@ -19,9 +19,9 @@ 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 = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api';
22   - PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api';
  22 + // PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api';
23 23  
24   - // PREFIX = 'http://128.10.249.48:9007';
  24 + PREFIX = 'http://128.10.249.39:9007';
25 25 }else{
26 26 // PREFIX = '/merchant-business';
27 27 // PREFIX = 'http://8.130.38.56:9004';
... ...
merchant-web-master/src/views/order/pending/index.vue
  View file @a18f16a
... ... @@ -94,7 +94,7 @@
94 94 <el-table-column label="操作" show-overflow-tooltip>
95 95 <template slot-scope="scope">
96 96 <div class="btnList">
97   - <div v-if="scope.row.state === 1" @click="changePrice(scope.row)" class="tableBtn greens" >改价</div>
  97 + <!-- <div v-if="scope.row.state === 1" @click="changePrice(scope.row)" class="tableBtn greens" >改价</div> -->
98 98 <div v-if="scope.row.state == 2" @click="view(scope.row)" class="tableBtn greens" >发货</div>
99 99 <div v-else @click="view(scope.row)" class="tableBtn greens" >查看</div>
100 100 </div>
... ...
merchant-web-master/src/views/order/pending/pendDetails.vue
  View file @a18f16a
... ... @@ -24,7 +24,10 @@
24 24 <span v-if="order.state === 2">待发货</span>
25 25 <span v-if="order.state === 3">待收货</span>
26 26 <span v-if="order.state === 4">已完成</span>
27   - <span v-if="order.state === 5">已取消</span>
  27 + <span v-if="order.state == 5">已关闭</span>
  28 + <span v-if="order.state == 6">待成团</span>
  29 + <span v-if="order.state == 7">待售后</span>
  30 + <span v-if="order.state == 8">已退款</span>
28 31 </p>
29 32 <p>
30 33 <span>售后状态:</span>
... ...