diff --git a/api/afterSale.js b/api/afterSale.js new file mode 100644 index 00000000..e5af8f5c --- /dev/null +++ b/api/afterSale.js @@ -0,0 +1,5 @@ +export const apiArr = { + afterSaleCreate: "/api/v2/wechat/commodity/after-sales/refund-info/create", //商品订单售后信息创建 + cancelOrConfirm: "/api/v2/wechat/commodity/order/cancel_or_confirm", //商品订单确认收货或取消 + isAllow: "/api/v2/wechat/commodity/after-sales/is-allow", //判断订单是否能申请售后 +}; diff --git a/api/community.js b/api/community.js index 87ba60ff..d3c76516 100644 --- a/api/community.js +++ b/api/community.js @@ -47,4 +47,5 @@ export const apiArr = { getPayOrderInfo:"/api/v2/wechat/community-order-pay/get-one", //根据缴费信息获取支付信息 getPayOrderList:"/api/v2/wechat/community-order-pay/get-page", //查询缴费记录 OrderPay:"/api/v2/wechat/community-order-pay/preorder",//预下单 + tradeQuery:"/api/v2/wechat/community-order-pay/trade-query",//缴费查单 }; \ No newline at end of file diff --git a/api/groupPurchase.js b/api/groupPurchase.js new file mode 100644 index 00000000..03ec9d0b --- /dev/null +++ b/api/groupPurchase.js @@ -0,0 +1,7 @@ +export const apiArr = { + groupBuyList: "/api/v2/wechat/commodity/group-buy/list", //团购列表 + groupGoodsList: "/api/v2/wechat/commodity/group-goods/list", //团购商品列表 + groupBuyAddress: "/api/v2/wechat/commodity/group-buy/address", //团购自提地址 + groupBuyRecord: "/api/v2/wechat/commodity/group-buy/buy-record", //团购购买记录 + groupBuyWriteOff: "/api/v2/wechat/commodity/group-buy/write-off", //团购核销 +}; diff --git a/api/park.js b/api/park.js new file mode 100644 index 00000000..2415d07d --- /dev/null +++ b/api/park.js @@ -0,0 +1,22 @@ +export const apiArr = { + carList: '/api/v2/wechat/smart-parking/car/list', // 车辆列表 + carAdd: '/api/v2/wechat/smart-parking/car/add', // 车辆添加 + + monthCardCreate: '/api/v2/wechat/smart-parking/month-card/create', // 月卡订单创建 + monthCardOrderList: '/api/v2/wechat/smart-parking/month-card/order/list', // 包月订单列表 + monthCardOrderPreorder: '/api/v2/wechat/smart-parking/month-card/order/preorder', // 月卡充值预下单 + monthCardOrderQuery: '/api/v2/wechat/smart-parking/month-card/order/trade_query', // 月卡充值订单交易查询 + billingRulesList: '/api/v2/wechat/smart-parking/billing-rules/list', // 月卡计费规则列表 + + tempParkingCreate: '/api/v2/wechat/smart-parking/temp-parking/create', // 临时车缴费订单创建 + tempParkingInfo: '/api/v2/wechat/smart-parking/temp-parking/info', // 临时车缴费信息 + tempParkingOrderDelete: '/api/v2/wechat/smart-parking/temp-parking/order/delete', // 临时车停车订单删除 + tempParkingOrderInfo: '/api/v2/wechat/smart-parking/temp-parking/order/info', // 临时车停车订单信息 + tempParkingOrderList: '/api/v2/wechat/smart-parking/temp-parking/order/list', // 临时车停车订单列表 + tempParkingOrderPreorder: '/api/v2/wechat/smart-parking/temp-parking/preorder', // 临时车缴费订单预下单 + tempParkingOrderQuery: '/api/v2/wechat/smart-parking/temp-parking/trade_query', // 临时车缴费订单交易查询 + + parkList: '/api/v2/wechat/smart-parking/parking/list', // 停车场列表 + + deleteCar: '/api/v2/wechat/smart-parking/car/del', // 删除车辆 +} \ No newline at end of file diff --git a/api/shop.js b/api/shop.js index 1c29dee1..87b18479 100644 --- a/api/shop.js +++ b/api/shop.js @@ -12,5 +12,12 @@ export const apiArr = { payOrder: "/api/v2/wechat/commodity/order/pay",//支付订单 settingDefaultAddress: '/api/v2/wechat/commodity/receiving_address/default', // 收货地址设置默认 updateAddress: '/api/v2/wechat/commodity/receiving_address/update', // 收货地址修改 + addAddress: '/api/v2/wechat/commodity/receiving_address/add', // 收货地址添加 + addAddressList: '/api/v2/wechat/commodity/receiving_address', // 收货地址列表 queryOrder: '/api/v2/wechat/commodity/order/trade_query', // 查询订单 + getComment: '/api/v2/wechat/commodity/review/list', // 获取评论 + + mergePreorder: '/api/v2/wechat/commodity/order/preorder', // 商品订单合并预下单 + + goodsSearch: '/api/v2/wechat/commodity/search', // 商品搜索 } \ No newline at end of file diff --git a/components/search/search.vue b/components/search/search.vue index cd2ef24c..62250257 100644 --- a/components/search/search.vue +++ b/components/search/search.vue @@ -39,23 +39,26 @@ this.address = uni.getStorageSync('city'); return; } - uni.request({ - url: apiArr.get_host_info, - method: 'post', - header: { - 'Content-type': 'application/x-www-form-urlencoded' - }, - dataType: 'json', - success: (result) => { - console.log(result, 'result'); - let wxapp = result.data.all.wxapp; + this.qqmap_key = '55NBZ-MUQYW-EAJRL-YIWPA-ZXCR6-4NBPP'; + this.getUserLocation() - if (wxapp) { - this.qqmap_key = wxapp.qqmap_key; - this.getUserLocation() - } - }, - }) + // uni.request({ + // url: apiArr.get_host_info, + // method: 'post', + // header: { + // 'Content-type': 'application/x-www-form-urlencoded' + // }, + // dataType: 'json', + // success: (result) => { + // console.log(result, 'result'); + // let wxapp = result.data.all.wxapp; + + // if (wxapp) { + // this.qqmap_key = wxapp.qqmap_key; + // this.getUserLocation() + // } + // }, + // }) }, getUserLocation() { diff --git a/packages/community/choseCommunity/index.vue b/packages/community/choseCommunity/index.vue index 9136109c..06758a4b 100644 --- a/packages/community/choseCommunity/index.vue +++ b/packages/community/choseCommunity/index.vue @@ -201,7 +201,7 @@ export default { ? this.city.ad_code : uni.getStorageSync("ad_code"), page_num: this.page_num, - page_size: this.page_size, + page_size: 9999, }).then((res) => { console.log(res.rows); this.communityList = res.rows; diff --git a/packages/community/index/index.css b/packages/community/index/index.css index aac0a2d6..a37f46cc 100644 --- a/packages/community/index/index.css +++ b/packages/community/index/index.css @@ -106,6 +106,18 @@ image { position: relative; } +.swiperBox_no1 { + height: 300rpx; + width: 710rpx; + position: relative; + margin-top: 170rpx; + margin: 170rpx auto 0; +} + +.swiperBox_no_img{ + border-radius: 15rpx; +} + .swiperBox1 swiper { height: 100%; } @@ -154,6 +166,12 @@ image { margin-top: -96rpx; } +.swiperBox_no2 { + height: 150rpx; + width: 710rpx; + margin: 0 auto;; +} + .funcList { display: flex; align-items: center; diff --git a/packages/community/index/index.vue b/packages/community/index/index.vue index a24e039f..6c896e46 100644 --- a/packages/community/index/index.vue +++ b/packages/community/index/index.vue @@ -1,21 +1,59 @@ + + \ No newline at end of file diff --git a/packages/community/myCommunity/index.css b/packages/community/myCommunity/index.css index 66565a52..4886b38c 100644 --- a/packages/community/myCommunity/index.css +++ b/packages/community/myCommunity/index.css @@ -1,6 +1,40 @@ page { - background-color: #f6f7fb; + background-color: #ffffff; padding: 0; + overflow-y: hidden; +} + +.searchBox { + padding-bottom: 24rpx; + background-color: #fff; + margin-top: 105rpx; +} + +.searchBox_add { + height: 100%; + width: 100%; + display: flex; +} + +.searchBox_left { + flex: 1; + display: flex; + align-items: center; + padding-left: 20rpx; +} + +.searchBox_mid { + flex: 1; + font-size: 40rpx; + color: #222222; + text-align: center; + display: flex; + align-items: center; + justify-content: center; +} + +.searchBox_right { + flex: 1; } .container { @@ -22,9 +56,22 @@ image { margin-top: 180rpx; } +.emptyTitle { + font-size: 36rpx; + color: #222222; + margin-top: 50rpx; + font-weight: bold; +} + +.emptyMsg { + font-size: 28rpx; + color: #999999; + margin: 30rpx; +} + .empty image { - width: 340rpx; - height: 240rpx; + width: 500rpx; + height: 400rpx; } .addBtn { @@ -57,11 +104,13 @@ image { border-bottom: 1rpx solid #EBEBEB; padding: 30rpx 0; } -.communityItem_left{ + +.communityItem_left { display: flex; align-items: center; } + .communityItem_left_img { width: 160rpx; height: 140rpx; @@ -69,9 +118,11 @@ image { overflow: hidden; margin-right: 30rpx; } -.communityItem_left_msg{ + +.communityItem_left_msg { flex: 1; } + .communityItem_left_msg_tit { font-size: 30rpx; color: #222222; @@ -86,7 +137,7 @@ image { color: #999999; } -.communityItem_right{ +.communityItem_right { width: 34rpx; height: 34rpx; margin-left: 80rpx; @@ -95,4 +146,4 @@ image { /* 最后一个 communityItem */ .communityItem:last-child { border-bottom: none; -} +} \ No newline at end of file diff --git a/packages/community/myCommunity/index.vue b/packages/community/myCommunity/index.vue index 579909fb..cbf0a229 100644 --- a/packages/community/myCommunity/index.vue +++ b/packages/community/myCommunity/index.vue @@ -1,35 +1,44 @@ @@ -53,6 +62,9 @@ export default { } }, methods: { + back() { + NavgateTo("/packages/community/index/index") + }, addCommunity() { NavgateTo("/packages/community/addCommunity/index") }, @@ -78,9 +90,8 @@ export default { choseCommunity(e) { this.currentCommunity = e uni.setStorageSync('changeCommData', { id: e.community_id, name: e.name }); - uni.setStorageSync('currentCommunityAddr',e.addr); + uni.setStorageSync('currentCommunityAddr', e.addr); uni.setStorageSync("isShowNav", e.room_owner_list[0].type) - console.log("🚀 ~ choseCommunity ~ e.room_owner_list[0].type:", e.room_owner_list[0].type) NavgateTo("1") }, }, diff --git a/packages/community/oneRepair/index.vue b/packages/community/oneRepair/index.vue index f5896b54..0535eb01 100644 --- a/packages/community/oneRepair/index.vue +++ b/packages/community/oneRepair/index.vue @@ -1,97 +1,97 @@ - - \ No newline at end of file diff --git a/packages/health/index/index.vue b/packages/health/index/index.vue deleted file mode 100644 index fd576ae4..00000000 --- a/packages/health/index/index.vue +++ /dev/null @@ -1,611 +0,0 @@ - - - - - \ No newline at end of file diff --git a/packages/health/reportDesc/reportDesc.vue b/packages/health/reportDesc/reportDesc.vue deleted file mode 100644 index c90b4312..00000000 --- a/packages/health/reportDesc/reportDesc.vue +++ /dev/null @@ -1,203 +0,0 @@ - - - - - \ No newline at end of file diff --git a/packages/health/reportList/reportList.vue b/packages/health/reportList/reportList.vue deleted file mode 100644 index 91c07691..00000000 --- a/packages/health/reportList/reportList.vue +++ /dev/null @@ -1,159 +0,0 @@ - - - - - \ No newline at end of file diff --git a/packages/health/selfTest/selfTest.vue b/packages/health/selfTest/selfTest.vue deleted file mode 100644 index 1d4edc9b..00000000 --- a/packages/health/selfTest/selfTest.vue +++ /dev/null @@ -1,204 +0,0 @@ - - - - - \ No newline at end of file diff --git a/packages/homeServer/index/index.css b/packages/homeServer/index/index.css index e9e7fb7f..16fc9b38 100644 --- a/packages/homeServer/index/index.css +++ b/packages/homeServer/index/index.css @@ -1,5 +1,4 @@ .container { - margin-top: 87rpx; padding: 0 15rpx; background-color: whte; } diff --git a/packages/homeServer/index/index.vue b/packages/homeServer/index/index.vue index bdec1bac..086b9158 100644 --- a/packages/homeServer/index/index.vue +++ b/packages/homeServer/index/index.vue @@ -1,9 +1,9 @@