webapp / GreenwayWeb

Commit 5dd84cf51444e5c1f4c65e289be1ca58d53f3aac

Authored by 杨鑫
1 parent 84cfe204

最新

Inline Side-by-side
Showing 12 changed files with 54 additions and 50 deletions
admin-web-master/dist.zip
View file @5dd84cf
No preview for this file type
admin-web-master/src/layout/index.vue
  View file @5dd84cf
... ... @@ -200,17 +200,17 @@
200 200 }
201 201 }
202 202 return {
203   - msg: [],
204   - list: [],
  203 + // msg: [],
  204 + // list: [],
205 205 // msg: ['招商服务系统'],
206   - // msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],
207   - // list: [
208   - // ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'],
209   - // ['品牌策划', '活动策划', '氛围策划', '媒体推广'],
210   - // ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'],
211   - // ['联机交易', '对账处理', '日志管理', '商户服务'],
212   - // ['渠道售票统计分析', '销售额统计分析'],
213   - // ],
  206 + msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],
  207 + list: [
  208 + ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'],
  209 + ['品牌策划', '活动策划', '氛围策划', '媒体推广'],
  210 + ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'],
  211 + ['联机交易', '对账处理', '日志管理', '商户服务'],
  212 + ['渠道售票统计分析', '销售额统计分析'],
  213 + ],
214 214 listMune: [],
215 215 mumeList: [],
216 216 mumeChildren1: [],
... ... @@ -299,10 +299,10 @@
299 299 this.userAvatar = getUserAvatar()
300 300 },
301 301 mounted() {
302   - this.getMemu()
303   - this.address()
304   - this.waibu()
305   - // this.neibu()
  302 + // this.getMemu()
  303 + // this.address()
  304 + // this.waibu()
  305 + this.neibu()
306 306 },
307 307  
308 308 methods: {
... ... @@ -786,12 +786,12 @@
786 786 ['联机交易', '对账处理', '日志管理', '商户服务'],
787 787 ['渠道售票统计分析', '销售额统计分析'],
788 788 ]
789   - // this.neibu()
  789 + this.neibu()
790 790  
791 791  
792   - this.getMemu()
793   - this.waibu()
794   - this.list = this.mumeList
  792 + // this.getMemu()
  793 + // this.waibu()
  794 + // this.list = this.mumeList
795 795  
796 796  
797 797 },
... ...
admin-web-master/src/utils/request.js
  View file @5dd84cf
... ... @@ -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.23:9003';
  25 + // baseURL = 'http://128.10.249.25:9003';
26 26  
27 27  
28 28 } else {
... ...
admin-web-master/src/utils/request2.js
  View file @5dd84cf
... ... @@ -20,7 +20,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost
20 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.26';
  23 + baseURL = 'http://128.10.249.25';
24 24 } else {
25 25 console.error('---------------------')
26 26 console.error(hostall)
... ...
admin-web-master/src/views/online/chartAnalysis/index.vue
  View file @5dd84cf
... ... @@ -90,7 +90,7 @@
90 90 tabTitle: '',
91 91 jiaosucc:78,
92 92 pageindex:{
93   - startTime:"2020-09-11",
  93 + startTime:"2020-01-01",
94 94 endTime:"2030-12-29"
95 95 },
96 96 Time:[],
... ... @@ -270,7 +270,7 @@
270 270 },
271 271 resetting(){
272 272 this.pageindex= {
273   - startTime:"2020-09-11",
  273 + startTime:"2020-01-01",
274 274 }
275 275 const now = new Date();
276 276 const year = now.getFullYear();
... ...
admin-web-master/src/views/online/transaction/index.vue
  View file @5dd84cf
... ... @@ -115,8 +115,8 @@
115 115 address: '789'
116 116 }],
117 117 pageindex:{
118   - startTime:"2024-09-11",
119   - endTime:"2024-11-09"
  118 + startTime:"2020-01-01",
  119 + endTime:""
120 120 },
121 121 Time:[]
122 122 }
... ... @@ -126,6 +126,11 @@
126 126  
127 127 },
128 128 mounted() {
  129 + const now = new Date();
  130 + const year = now.getFullYear();
  131 + const month = String(now.getMonth() + 1).padStart(2, '0')
  132 + const day = String(now.getDate()).padStart(2, '0')
  133 + this.pageindex.endTime= `${year}-${month}-${day}`
129 134 this.getAll()
130 135 },
131 136 methods: {
... ... @@ -256,19 +261,18 @@ let processedData = datas.map(item => ({
256 261 }
257 262 },
258 263 resetting(){
259   - this.pageindex= {
260   - startTime:"2024-09-11",
261   - endTime:"2024-11-09"
262   - },
263   - this.Time=[]
  264 + this.pageindex= {
  265 + startTime:"2020-01-01",
  266 + }
  267 + const now = new Date();
  268 + const year = now.getFullYear();
  269 + const month = String(now.getMonth() + 1).padStart(2, '0')
  270 + const day = String(now.getDate()).padStart(2, '0')
  271 + this.pageindex.endTime= `${year}-${month}-${day}`
  272 + this.Time=[]
264 273 this.getAll()
265 274 },
266   - handleSizeChange() {
267 275  
268   - },
269   - handleCurrentChange() {
270   -
271   - }
272 276 }
273 277 }
274 278 </script>
... ...
admin-web-master/src/views/setup/businessMenus/index.vue
  View file @5dd84cf
... ... @@ -171,7 +171,7 @@ export default {
171 171 return {
172 172 formInline: {
173 173 permissionName: '', // 搜索字段
174   - page: '1', // 当前页
  174 + page: '0', // 当前页
175 175 pageSize: '10' // 每页记录数
176 176 },
177 177 total: 1,
... ... @@ -308,14 +308,14 @@ export default {
308 308 // 查询
309 309 search () {
310 310 this.total = 1
311   - this.formInline.page = 1
  311 + this.formInline.page = 0
312 312 this.getAll(this.formInline)
313 313 },
314 314 // 清除
315 315 clear () {
316 316 this.formInline = {
317 317 permissionName: '', // 搜索字段
318   - page: '1', // 当前页
  318 + page: '0', // 当前页
319 319 pageSize: '10' // 每页记录数
320 320 }
321 321 this.getAll(this.formInline)
... ... @@ -506,8 +506,8 @@ export default {
506 506 // 初始化查询所有数据
507 507 async getAll (formInline) {
508 508 const res = await businessTabsGetAll(formInline)
509   - this.tableData = res.data.list
510   - this.total = res.data.total
  509 + this.tableData = res.data.content
  510 + this.total = res.data.totalElements
511 511 }
512 512 }
513 513 }
... ...
ceres-uniapp-master/config/api.js
  View file @5dd84cf
1 1  
2   -// const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
3   -// const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
4   -// const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
  2 +const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
  3 +const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
  4 +const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
5 5 // const DOMAIN_PREFIXPING = 'http://128.10.249.26:9003'
6 6 // const DOMAIN_PREFIX = 'http://128.10.249.26:9007'
7 7 // const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
... ... @@ -9,10 +9,10 @@
9 9 // const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
10 10  
11 11  
12   -const host = `${window.location.protocol}//${window.location.host}`
13   -const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
14   -const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api`
15   -const TIAOZHUAN = `${host}/cdwlMall/`
  12 +// const host = `${window.location.protocol}//${window.location.host}`
  13 +// const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
  14 +// const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api`
  15 +// const TIAOZHUAN = `${host}/cdwlMall/`
16 16  
17 17  
18 18  
... ...
ceres-uniapp-master/pages_category_page1/goodsModule/goodsDetails.vue
  View file @5dd84cf
... ... @@ -145,7 +145,7 @@
145 145 </view>
146 146 <view class="btns flex-column-plus" @click="kefu">
147 147 <image class="store-icon"
148   - src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/storeIcon.png">
  148 + src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/service-product-detail.png">
149 149 </image>
150 150 <label class="fs22">客服</label>
151 151 </view>
... ...
merchant-web-master/src/utils/request.js
  View file @5dd84cf
... ... @@ -21,7 +21,7 @@ let PREFIX;
21 21 // PREFIX = 'http://8.130.38.56:8027/business-server';
22 22 // PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server';
23 23 // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
24   - PREFIX = 'http://128.10.249.26:9004';
  24 + PREFIX = 'http://128.10.249.25: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 @5dd84cf
... ... @@ -21,7 +21,7 @@ let PREFIX;
21 21 // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api';
22 22 // PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api';
23 23  
24   - PREFIX = 'http://128.10.249.26:9007';
  24 + PREFIX = 'http://128.10.249.25:9007';
25 25 }else{
26 26 // PREFIX = '/merchant-business';
27 27 // PREFIX = 'http://8.130.38.56:9004';
... ...
merchant-web-master/src/views/commodity/commoditySystem/index.vue
  View file @5dd84cf
... ... @@ -114,7 +114,7 @@
114 114 <div slot="tip" class="el-upload__tip">只能上传xlsx文件，且不超过10M</div>
115 115 <div slot="tip" class="el-upload__tip">
116 116 上传前不知道excel模板的，请点击
117   - <span class="clickMe" @click="poDownload">点我下载模板</span> 去下载
  117 + <span class="clickMe" style="color:#3F9B6A;" @click="poDownload">点我下载模板</span> 去下载
118 118 </div>
119 119 </el-upload>
120 120 <br>
... ...