diff --git a/admin-web-master/src/components/add/addht.vue b/admin-web-master/src/components/add/addht.vue index 7f5d21d..576aa2f 100644 --- a/admin-web-master/src/components/add/addht.vue +++ b/admin-web-master/src/components/add/addht.vue @@ -236,7 +236,7 @@ import { let info = await this.culfj() console.error(info) let c1 = { - documentAddress: "http://172.16.61.237:9000" + this.templateAttachment, + documentAddress: "http://172.16.10.237:19000" + this.templateAttachment, insertData: JSON.stringify(info) } dataInprotDocument(c1).then(res => { @@ -329,7 +329,7 @@ import { let info = await this.culfj() console.error(info) let c1 = { - documentAddress: "http://172.16.61.237:9000" + this.templateAttachment, + documentAddress: "http://172.16.10.237:19000" + this.templateAttachment, insertData: JSON.stringify(info) } dataInprotDocument(c1).then(res => { @@ -483,7 +483,7 @@ import { let info = await this.culfj() console.error(info) let c1 = { - documentAddress: "http://172.16.61.237:9000" + this.templateAttachment, + documentAddress: "http://172.16.10.237:19000" + this.templateAttachment, insertData: JSON.stringify(info) } dataInprotDocument(c1).then(res => { diff --git a/admin-web-master/src/components/add/addmb.vue b/admin-web-master/src/components/add/addmb.vue index aa98c14..b07eb8e 100644 --- a/admin-web-master/src/components/add/addmb.vue +++ b/admin-web-master/src/components/add/addmb.vue @@ -278,10 +278,10 @@ import { Input } from "element-ui"; { name: '承租人银行账号', key: 'tenantBankAccount', - type: '单行数字文本', + type: '银行账号', isrequired: '是', width: '50%（半行）', - length: '20', + length: '', value: '', }, { @@ -305,7 +305,7 @@ import { Input } from "element-ui"; { name: '联系电话', key: 'tenantTelephone', - type: '单行数字文本', + type: '联系电话', isrequired: '是', width: '50%（半行）', length: '20', diff --git a/admin-web-master/src/components/add/addsam.vue b/admin-web-master/src/components/add/addsam.vue index b69f17e..afb7ce1 100644 --- a/admin-web-master/src/components/add/addsam.vue +++ b/admin-web-master/src/components/add/addsam.vue @@ -30,18 +30,20 @@ - + + + - + + @@ -69,9 +71,10 @@ - + + + - + + @@ -247,9 +251,10 @@ - + + - + diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue index e748c5a..a73cb9b 100644 --- a/admin-web-master/src/layout/index.vue +++ b/admin-web-master/src/layout/index.vue @@ -197,17 +197,17 @@ } } return { - // msg: [], - // list: [], + msg: [], + list: [], // msg: ['招商服务系统'], - msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'], - list: [ - ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'], - ['品牌策划', '活动策划', '氛围策划', '媒体推广'], - ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'], - ['联机交易', '对账处理', '日志管理', '商户服务'], - ['渠道售票统计分析', '销售额统计分析'], - ], + // msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'], + // list: [ + // ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'], + // ['品牌策划', '活动策划', '氛围策划', '媒体推广'], + // ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'], + // ['联机交易', '对账处理', '日志管理', '商户服务'], + // ['渠道售票统计分析', '销售额统计分析'], + // ], listMune: [], mumeList: [], mumeChildren1: [], @@ -296,10 +296,10 @@ this.userAvatar = getUserAvatar() }, mounted() { - // this.getMemu() - // this.address() - // this.waibu() - this.neibu() + this.getMemu() + this.address() + this.waibu() + // this.neibu() }, methods: { @@ -780,12 +780,12 @@ ['联机交易', '对账处理', '日志管理', '商户服务'], ['渠道售票统计分析', '销售额统计分析'], ] - this.neibu() + // this.neibu() - // this.getMemu() - // this.waibu() - // this.list = this.mumeList + this.getMemu() + this.waibu() + this.list = this.mumeList }, diff --git a/admin-web-master/src/main.js b/admin-web-master/src/main.js index 6a4574e..a06cfd4 100644 --- a/admin-web-master/src/main.js +++ b/admin-web-master/src/main.js @@ -37,10 +37,15 @@ Vue.prototype.$hostUrl =`${window.location.protocol}//${window.location.host}/cd let host = window.location.host; if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { - Vue.prototype.$baseURL ='https://jy.scjysm.asia:18086/cdwlMall' - Vue.prototype.$fontBold = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf` - Vue.prototype.$fontRegular = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf` - Vue.prototype.$API = `https://jy.scjysm.asia:18086/cdwlMall/meserver/api` + // Vue.prototype.$baseURL ='https://jy.scjysm.asia:18086/cdwlMall' + // Vue.prototype.$fontBold = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf` + // Vue.prototype.$fontRegular = `https://jy.scjysm.asia:18086/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf` + // Vue.prototype.$API = `https://jy.scjysm.asia:18086/cdwlMall/meserver/api` + + Vue.prototype.$baseURL ='https://zhgw-uat.028wlkj.com/cdwlMall' + Vue.prototype.$fontBold = `https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf` + Vue.prototype.$fontRegular = `https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf` + Vue.prototype.$API = `https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api` } else { Vue.prototype.$API = `${window.location.protocol}//${window.location.host}/cdwlMall/meserver/api` Vue.prototype.$baseURL =`${window.location.protocol}//${window.location.host}/cdwlMall` diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js index 4b7f134..5c76a1b 100644 --- a/admin-web-master/src/utils/request2.js +++ b/admin-web-master/src/utils/request2.js @@ -16,7 +16,8 @@ let hostall = window.location.href; let baseURL = '' // || host === 'localhost:9528' if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { - baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; + // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; + baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; // baseURL = 'http://172.16.61.125:9004'; // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server'; // baseURL = 'http://128.10.249.206:9004'; diff --git a/lvdao-miniapp/pages.json b/lvdao-miniapp/pages.json index 70c0295..e968a3f 100644 --- a/lvdao-miniapp/pages.json +++ b/lvdao-miniapp/pages.json @@ -389,6 +389,30 @@ "navigationBarBackgroundColor": "#FFFFFF", "navigationBarTitleText": "问卷调查" } + }, + { + "path" : "pages/orderList/orderListdetails", + "style" : + { + "navigationBarBackgroundColor": "#FFFFFF", + "navigationBarTitleText": "订单详情" + } + }, + { + "path" : "pages/orderList/aftersaledetails", + "style" : + { + "navigationBarBackgroundColor": "#FFFFFF", + "navigationBarTitleText": "售后订单详情" + } + }, + { + "path" : "pages/orderList/inventorydetails", + "style" : + { + "navigationBarBackgroundColor": "#FFFFFF", + "navigationBarTitleText": "商品详情" + } } ], "subpackages": [{ diff --git a/lvdao-miniapp/pages/orderList/aftersale.vue b/lvdao-miniapp/pages/orderList/aftersale.vue index 02409e3..c3f6e8a 100644 --- a/lvdao-miniapp/pages/orderList/aftersale.vue +++ b/lvdao-miniapp/pages/orderList/aftersale.vue @@ -1,8 +1,135 @@ - \ No newline at end of file diff --git a/lvdao-miniapp/pages/orderList/aftersaledetails.vue b/lvdao-miniapp/pages/orderList/aftersaledetails.vue new file mode 100644 index 0000000..e6a748b --- /dev/null +++ b/lvdao-miniapp/pages/orderList/aftersaledetails.vue @@ -0,0 +1,759 @@ + + + + + + \ No newline at end of file diff --git a/lvdao-miniapp/pages/orderList/details.scss b/lvdao-miniapp/pages/orderList/details.scss new file mode 100644 index 0000000..74d8c93 --- /dev/null +++ b/lvdao-miniapp/pages/orderList/details.scss @@ -0,0 +1,165 @@ +.page { + position: relative; + width: 100%; + // height: 100%; + overflow-x: hidden; + // overflow-y: auto; +} + +// 图片 +.banner-img { + width: 100%; + height: 30vh; + line-height: 80rpx; +} +// 商铺信息 +.banner { + position: absolute; + top: calc(30vh - 30rpx); + width: 100%; + // margin-top: -20rpx; + border-radius: 30rpx; + background-color: #fff; + padding: 26rpx 34rpx 100rpx; + .banner-item { + border-bottom: 2rpx solid #EBEBEB; + padding-bottom: 32rpx; + .banner-item-title { + font-size: 28rpx; + font-weight: 700; + line-height: 48rpx; + margin-top: 30rpx; + } + .banner-item-form { + .form-item { + line-height: 30rpx; + font-size: 24rpx; + display: flex; + justify-content: flex-start; + align-items: top; + padding: 14rpx 0; + } + } + &:last-child { + border-bottom: unset; + } + } + // 基础信息 + .info { + .info-title { + font-weight: bold; + font-size: 32rpx; + // margin-bottom: 24rpx; + span { + display: inline-block; + padding: 0 8rpx; + } + } + .info-text { + margin-bottom: 30rpx; + } + .info-racord { + display: flex; + justify-content: space-between; + align-items: center; + .info-price { + color: #31AA6A; + span { + font-size: 40rpx; + font-weight: 700; + margin-right: 4rpx; + } + } + } + } + // 场地信息 + // 位置信息 + .position { + .position-info { + display: flex; + align-items: center; + flex-direction: row; + margin: 53rpx 22rpx; + background-color: #fff; + font-size: 24rpx; + padding: 20rpx 16rpx; + line-height: 30rpx; + border-radius: 14rpx; + text { + margin-left: 10rpx; + } + } + } + // 周边商铺 + .other-business { + .scroll-view_H { + white-space: nowrap; + width: 100%; + } + .scroll-view-item_H { + display: inline-block; + width: 210rpx; + margin-right: 22rpx; + &:last-child { + margin-right: 0; + } + .business-card { + width: 100%; + .u-image { + overflow: hidden !important; + border-radius: 20rpx !important; + } + .business-card-title { + width: 100%; + overflow : hidden;/*必须结合的属性,当内容溢出元素框时发生的事情*/ + text-overflow: ellipsis;/*可以用来多行文本的情况下，用省略号“…”隐藏超出范围的文本 。*/ + // display: -webkit-box;/*必须结合的属性 ，将对象作为弹性伸缩盒子模型显示 。*/ + // -webkit-line-clamp: 2;/*用来限制在一个块元素显示的文本的行数。*/ + // -webkit-box-orient: vertical;/*必须结合的属性 ，设置或检索伸缩盒对象的子元素的排*/ + line-height: 30rpx; + margin: 10rpx 0; + padding: 0 10rpx; + } + .business-card-item { + padding: 0 10rpx; + font-weight: 400; + font-size: 20rpx; + color: #676767; + line-height: 1.5; + span { + font-weight: 700; + font-size: 30rpx; + color: #000000; + } + } + } + } + } +} + +/* 底部 */ +.page-footer{ + position: fixed; + left: 0; + bottom: 0; + display: flex; + align-items: center; + justify-content: center; + width: 100%; + height: 60px; + background-color: #FFFFFF; + + .footer-btn { + display: flex; + width: 90%; + } + .footer-service { + display: flex; + flex-direction: column; + align-items: center; + text { + margin-top: 6rpx; + line-height: 32rpx; + } + } +} \ No newline at end of file diff --git a/lvdao-miniapp/pages/orderList/inventory.vue b/lvdao-miniapp/pages/orderList/inventory.vue index 02409e3..f57dab1 100644 --- a/lvdao-miniapp/pages/orderList/inventory.vue +++ b/lvdao-miniapp/pages/orderList/inventory.vue @@ -1,8 +1,128 @@ - \ No newline at end of file diff --git a/lvdao-miniapp/pages/orderList/inventorydetails.vue b/lvdao-miniapp/pages/orderList/inventorydetails.vue new file mode 100644 index 0000000..dfaaed3 --- /dev/null +++ b/lvdao-miniapp/pages/orderList/inventorydetails.vue @@ -0,0 +1,749 @@ + + + + + + \ No newline at end of file diff --git a/lvdao-miniapp/pages/orderList/orderList.vue b/lvdao-miniapp/pages/orderList/orderList.vue index c6a490d..9bc30d2 100644 --- a/lvdao-miniapp/pages/orderList/orderList.vue +++ b/lvdao-miniapp/pages/orderList/orderList.vue @@ -2,41 +2,50 @@ - - + - 订单号：131313 + 订单号：{{item.orderId}} - 待付款 + + 待付款 + 待发货 + 待收货 + 已完成 + 已关闭 + - + - + - 产品名称 - 下单时间：11312 + style="display: flex;flex-direction: column;justify-content: space-between;margin-left: 15rpx;"> + {{item1.productName}} + 规格：{{ item1.value }} - - ￥444 - X1 + + ￥ {{item1.productPrice*item1.number}} + X{{ item1.number }} - 共1件商品，合计 - ￥49 + 共{{item.products.length}}件商品，合计 + ¥{{ item.price }} - - 查看详情 + + {{item.createTime}} + @@ -49,47 +58,80 @@ return { list: [ { + type:'', name: '全部' - }, + }, { + type:'1', name: '待付款' - }, + }, { + type:'2', name: '待发货', }, { + type:'3', name: '已发货', }, { + type:'4', name: '已完成', }, { + type:'5', name: '已关闭', }, ], current: 0, - + alllist: [], pageindex: { page: 1, pageSize: 10, + state:'' }, + imgurl: '', + total:0 }; }, - mounted() { + onLoad(optiong) { + this.imgurl = this.$img this.getALL() + // this.$http.sendRequest('/check/getAll', 'POST',{ this.pageindex}, 2).then(res => { + // //成功回调 + // this.list = res.data.data.list + // }) }, - onLoad(optiong) { - + onReachBottom (e){ + console.error(e) + if (this.alllist.length < this.total) { + this.pageindex.page++ + this.getALL() + } }, methods: { + gopath(url,id){ + uni.navigateTo({ + url:url+'?id='+id + }) + }, getALL() { - // this.$http.sendRequest('/order/getAll', 'POST', this.pageindex, 2).then(res => { - // //成功回调 - // this.list = res.data.data.list - // }) + this.$http.sendRequest('/order/getAll', 'POST', this.pageindex, 1).then(res => { + //成功回调 + this.alllist = [...this.alllist,...res.data.data.list] + this.total = res.data.data.total + console.error(this.alllist) + }) }, change(index) { this.current = index; + if(this.current == 0) { + this.pageindex.state = '' + } else { + this.pageindex.state = this.list[this.current].type + } + this.pageindex.page = 1 + this.alllist = [] + this.getALL() } } @@ -97,9 +139,7 @@ \ No newline at end of file diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js index 084f5bc..6bd5f6a 100644 --- a/lvdao-miniapp/utils/request.js +++ b/lvdao-miniapp/utils/request.js @@ -16,7 +16,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { } var bases = '' if(baseUrl == 1){ - // bases = 'http://128.10.249.32:9003/' + url; + // bases = 'http://128.10.249.22:9003' + url; // bases = 'http://172.16.61.123/cdwlMall/admin-server' + url; // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url; // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url; @@ -34,7 +34,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { bases = c1 + 'cdwlMall/meserver/api' + url; }else{ - // bases = 'http://172.16.61.125:9004/' + url; + // bases = 'http://128.10.249.22:9004' + url; // bases = 'http://172.16.61.48/business-server' + url; // bases = 'http://172.16.61.123/cdwlMall/business-server' + url; // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url; @@ -45,7 +45,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { } var token = uni.getStorageSync('token') || ''; - var shopId = uni.getStorageSync('shopId') || ''; + var shopId = uni.getStorageSync('shopId') || '154'; return new Promise(function(resolve, reject) { uni.showLoading({ title: '加载中...'