diff --git a/api/api.js b/api/api.js index 41ac26b..8e2e739 100644 --- a/api/api.js +++ b/api/api.js @@ -176,6 +176,16 @@ const config = { url: '/city/getCatDetail', method: 'GET', }, + //查询商城信息列表带分页 + getShopPingPage : { + url: '/city/getShopPingPage', + method: 'GET', + }, + //根据商品标识查询商品信息详情 + getShopPingDetail : { + url: '/city/getShopPingDetail', + method: 'GET', + }, @@ -263,6 +273,66 @@ const config = { method: 'GET', auth : true, }, + + + + // 用户查询地址列表 + getAddressList : { + url: '/token/getAddressList', + method: 'GET', + auth : true, + }, + // 用户获取地址信息列表详情 + getAddressDetail : { + url: '/token/getAddressDetail', + method: 'GET', + auth : true, + }, + // 用户增加或者编辑地址信息 + addOrEditAddress : { + url: '/token/addOrEditAddress', + method: 'POST', + auth : true, + showLoading : true, + limit : 1000, + }, + // 删除地址 + deleteAddress : { + url: '/token/deleteAddress', + method: 'POST', + auth : true, + showLoading : true, + }, + + + // 商城-立即兑换商品 + createPointsOrder : { + url: '/city/createPointsOrder', + method: 'POST', + auth : true, + showLoading : true, + limit : 1000, + }, + // 商城-立即兑换商品，微信支付购买商品 + createOrder : { + url: '/city/createOrder', + method: 'POST', + auth : true, + showLoading : true, + limit : 1000, + }, + // 商城-订单列表 + getOrderList : { + url: '/city/getOrderList', + method: 'POST', + auth : true, + }, + // 商城-订单详情 + getOrderDetail : { + url: '/city/getOrderDetail', + method: 'POST', + auth : true, + }, } diff --git a/components/base/addressSpot.vue b/components/base/addressSpot.vue index 9f612ab..70644f7 100644 --- a/components/base/addressSpot.vue +++ b/components/base/addressSpot.vue @@ -2,7 +2,8 @@ - + {{ address }} @@ -29,7 +30,8 @@ margin: 20rpx 0; display: flex; align-items: center; - background-color: #eee; + background-color: rgba($uni-color, 0.2); + color: $uni-color; padding: 10rpx 20rpx; width: fit-content; border-radius: 40rpx; diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue index d6b77d4..4ae27e9 100644 --- a/components/base/tabbar.vue +++ b/components/base/tabbar.vue @@ -43,6 +43,13 @@ "title": "首页", icon : 'home', }, + { + "selectedIconPath": "/static/image/tabbar/order-a.png", + "iconPath": "/static/image/tabbar/order.png", + "pagePath": "/pages/index/product", + "title": "商城", + icon : 'integral', + }, { "selectedIconPath": "/static/image/tabbar/order-a.png", "iconPath": "/static/image/tabbar/order.png", diff --git a/components/list/dynamic/daynamicInfo.vue b/components/list/dynamic/daynamicInfo.vue index 766bc70..259991d 100644 --- a/components/list/dynamic/daynamicInfo.vue +++ b/components/list/dynamic/daynamicInfo.vue @@ -3,17 +3,17 @@ - - + + diff --git a/components/user/productList.vue b/components/user/productList.vue index ad16f79..29ff668 100644 --- a/components/user/productList.vue +++ b/components/user/productList.vue @@ -1,30 +1,58 @@ diff --git a/pages/index/center.vue b/pages/index/center.vue index bd37d25..70c8634 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -12,8 +12,9 @@ mode="aspectFill"> + + @click="$utils.navigateTo('/pages_order/mine/setting')"> 设置 @@ -119,7 +120,7 @@ 暂未开放 - + diff --git a/pages/index/index.vue b/pages/index/index.vue index e63e836..6b6e512 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -30,7 +30,7 @@ {{ headinfo.name }} - + + + 江华便民生活好帮手 @@ -124,6 +127,14 @@ :title="headinfo.details" :image="headinfo.kefu" ref="customerServicePopup"/> + + + + @@ -385,4 +396,24 @@ } + .customerService{ + position: fixed; + top: calc(70vh + 120rpx); + right: 50rpx; + width: 100rpx; + height: 100rpx; + background-color: $uni-color; + border-radius: 50rpx; + display: flex; + justify-content: center; + align-items: center; + box-shadow: 0 0 10rpx 10rpx rgba(#000, 0.1); + z-index: 999; + overflow: hidden; + button{ + // background-color: ; + all : unset; + } + } + \ No newline at end of file diff --git a/pages/index/product.vue b/pages/index/product.vue new file mode 100644 index 0000000..6e0e478 --- /dev/null +++ b/pages/index/product.vue @@ -0,0 +1,195 @@ + + + + + diff --git a/pages_order/components/address/addressList.vue b/pages_order/components/address/addressList.vue index a296dad..ed2e837 100644 --- a/pages_order/components/address/addressList.vue +++ b/pages_order/components/address/addressList.vue @@ -90,12 +90,11 @@ //获取地址列表 getAddressList() { return new Promise((success, fail) => { - this.$api('addressPage', this.queryParams, res => { + this.$api('getAddressList', this.queryParams, res => { if (res.code == 200) { this.addressList = res.result.records || []; this.total = res.result.total || 0; res.result.records.forEach(n => { //筛选默认地址 - console.log(n); if (n.defaultFlag == 1) { this.selectAddress = n.id } diff --git a/pages_order/components/address/redactAddress.vue b/pages_order/components/address/redactAddress.vue index 3deb375..88034d4 100644 --- a/pages_order/components/address/redactAddress.vue +++ b/pages_order/components/address/redactAddress.vue @@ -14,11 +14,12 @@ - + @@ -37,7 +38,7 @@ + + \ No newline at end of file diff --git a/pages_order/mine/setting.vue b/pages_order/mine/setting.vue new file mode 100644 index 0000000..6dacd74 --- /dev/null +++ b/pages_order/mine/setting.vue @@ -0,0 +1,147 @@ + + + + + \ No newline at end of file diff --git a/pages_order/order/order.vue b/pages_order/order/order.vue new file mode 100644 index 0000000..936205f --- /dev/null +++ b/pages_order/order/order.vue @@ -0,0 +1,223 @@ + + + + + diff --git a/pages_order/order/orderDetail.vue b/pages_order/order/orderDetail.vue new file mode 100644 index 0000000..d06ffba --- /dev/null +++ b/pages_order/order/orderDetail.vue @@ -0,0 +1,564 @@ + + + + + diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue new file mode 100644 index 0000000..0ed9c0f --- /dev/null +++ b/pages_order/product/productDetail.vue @@ -0,0 +1,240 @@ + + + + + diff --git a/pages_order/renting/rentingList.vue b/pages_order/renting/rentingList.vue index 39cf982..e183860 100644 --- a/pages_order/renting/rentingList.vue +++ b/pages_order/renting/rentingList.vue @@ -73,5 +73,9 @@ .list{ padding: 10rpx; } + + /deep/ .uv-drop-down{ + justify-content: space-around; + } } \ No newline at end of file diff --git a/pages_order/scenicSpot/scenicSpotList.vue b/pages_order/scenicSpot/scenicSpotList.vue index cacf4af..9b99acf 100644 --- a/pages_order/scenicSpot/scenicSpotList.vue +++ b/pages_order/scenicSpot/scenicSpotList.vue @@ -132,8 +132,7 @@ \ No newline at end of file diff --git a/pages_order/work/workList.vue b/pages_order/work/workList.vue index 63a17e4..cce0bf0 100644 --- a/pages_order/work/workList.vue +++ b/pages_order/work/workList.vue @@ -10,8 +10,7 @@ - - + @@ -35,25 +34,6 @@ data() { return { mixinsListApi: 'getJobPage', - tabsList: [{ - name: '最新职位', - }, { - name: '零售店/个体户', - }, { - name: '美术/图形设计' - }, { - name: '跑腿' - }, { - name: '音乐' - }, { - name: '美食' - }, { - name: '文化' - }, { - name: '财经' - }, { - name: '手工' - }] } }, methods: { @@ -72,4 +52,7 @@ \ No newline at end of file diff --git a/store/store.js b/store/store.js index becbd21..20f28c2 100644 --- a/store/store.js +++ b/store/store.js @@ -110,6 +110,22 @@ const store = new Vuex.Store({ } }) }, + // 退出登录 + logout(state){ + uni.showModal({ + title: '确认退出登录吗', + success(r) { + if(r.confirm){ + state.userInfo = {} + state.role = false + uni.removeStorageSync('token') + uni.redirectTo({ + url: '/pages/index/index' + }) + } + } + }) + }, }, actions: {}, }) diff --git a/uni.scss b/uni.scss index 9d1e07c..77513ed 100644 --- a/uni.scss +++ b/uni.scss @@ -13,7 +13,7 @@ */ /* 颜色变量 */ $uni-color: #5baaff; - +$uni-price-color: #D03F25; /* 行为相关颜色 */ $uni-color-primary: #1671ff; diff --git a/utils/position.js b/utils/position.js index a2f8bef..7cf01d4 100644 --- a/utils/position.js +++ b/utils/position.js @@ -148,7 +148,7 @@ function getUserAddressByIp(key) { //根据IP获取当前用户位置 } //打开地图让用户选择位置 -function selectAddress(successCallback) { +function selectAddress(longitude, latitude, successCallback) { uni.chooseLocation({ // longitude, //经度 // latitude, //纬度