diff --git a/App.vue b/App.vue index 9ee06f8..b9ecc03 100644 --- a/App.vue +++ b/App.vue @@ -33,7 +33,7 @@ // #endif // #ifdef MP-WEIXIN - // 确认收货回调结果 + // 确认收货回调结果 console.log(options, 'options'); // #endif diff --git a/pages/app/sign.vue b/pages/app/sign.vue index 8d0947c..54d0a37 100644 --- a/pages/app/sign.vue +++ b/pages/app/sign.vue @@ -1,512 +1,532 @@ + .activity-des { + font-size: 26rpx; + font-weight: 500; + color: #666666; + line-height: 40rpx; + } + \ No newline at end of file diff --git a/pages/goods/index.vue b/pages/goods/index.vue index 19601af..e4e4dd4 100644 --- a/pages/goods/index.vue +++ b/pages/goods/index.vue @@ -13,7 +13,7 @@ + dotStyle="tag" imageMode="widthFix" dotCur="bg-mask-40" :seizeHeight="750" /> @@ -31,16 +31,17 @@ - -
+ +
- + {{ promos.title }}
- + 领券 @@ -54,15 +55,15 @@ - + @tap="state.showSelectSku = true" /> + + @buy="onBuy" @change="onSkuChange" @close="state.showSelectSku = false" /> @@ -88,25 +89,35 @@ - + + @get="onGet" /> - + + @close="state.showActivityModel = false" /> diff --git a/pages/goods/list.vue b/pages/goods/list.vue index 7058442..d625d2e 100644 --- a/pages/goods/list.vue +++ b/pages/goods/list.vue @@ -1,383 +1,352 @@ + .goods-box { + &:nth-last-of-type(1) { + margin-bottom: 0 !important; + } + + &:nth-child(2n) { + margin-right: 0; + } + } + + .list-icon { + width: 80rpx; + + .sicon-goods-card { + font-size: 40rpx; + } + + .sicon-goods-list { + font-size: 40rpx; + } + } + + .goods-card { + margin-left: 20rpx; + } + + .list-filter-tabs { + background-color: #fff; + } + + .filter-list-box { + padding: 28rpx 52rpx; + + .filter-item { + font-size: 28rpx; + font-weight: 500; + color: #333333; + line-height: normal; + margin-bottom: 24rpx; + + &:nth-last-child(1) { + margin-bottom: 0; + } + } + + .filter-item-active { + color: var(--ui-BG-Main); + } + } + + .tab-item { + height: 50px; + position: relative; + z-index: 11; + + .tab-title { + font-size: 30rpx; + } + + .cur-tab-title { + font-weight: $font-weight-bold; + } + + .tab-line { + width: 60rpx; + height: 6rpx; + border-radius: 6rpx; + position: absolute; + left: 50%; + transform: translateX(-50%); + bottom: 10rpx; + background-color: var(--ui-BG-Main); + z-index: 12; + } + } + \ No newline at end of file diff --git a/pages/pay/recharge.vue b/pages/pay/recharge.vue index ccd8adf..965fb3c 100644 --- a/pages/pay/recharge.vue +++ b/pages/pay/recharge.vue @@ -1,250 +1,268 @@ + .face-value-tag { + background: $white; + color: var(--ui-BG-Main); + font-family: OPPOSANS; + } + } + } + \ No newline at end of file diff --git a/pages/user/address/edit.vue b/pages/user/address/edit.vue index eb5e892..e5dad0b 100644 --- a/pages/user/address/edit.vue +++ b/pages/user/address/edit.vue @@ -101,6 +101,7 @@ }, ); const onRegionConfirm = (e) => { + console.log(e); state.model = { ...state.model, ...e, @@ -186,7 +187,13 @@ if (options.data) { let data = JSON.parse(options.data); - console.log(data) + const areaData = uni.getStorageSync('areaData'); + let provinceArr = areaData.filter(item => item.name == data.province_name); + data.province_id = provinceArr[0].id; + let provinceArr2 = provinceArr[0].children.filter(item => item.name == data.city_name); + data.city_id = provinceArr2[0].id; + let provinceArr3 = provinceArr2[0].children.filter(item => item.name == data.district_name); + data.district_id = provinceArr3[0].id; state.model = { ...state.model, ...data, diff --git a/sheep/api/activity.js b/sheep/api/activity.js index 83d620b..b8dc341 100644 --- a/sheep/api/activity.js +++ b/sheep/api/activity.js @@ -1,43 +1,54 @@ import request from '@/sheep/request'; export default { - myGroupon: (params) => - request({ - url: 'activity/groupon/myGroupons', - method: 'GET', - params, - }), - getGrouponList: (params) => - request({ - url: 'activity/groupon', - method: 'GET', - params, - }), - grouponDetail: (id) => - request({ - url: 'activity/groupon/' + id, - method: 'GET', - }), - signList: (params) => - request({ - url: 'activity/signin', - method: 'GET', - params, - }), - signAdd: () => - request({ - url: 'activity/signin', - method: 'POST', - }), - replenish: (data) => - request({ - url: 'activity/signin/replenish', - method: 'POST', - data, - }), - activity: (id) => - request({ - url: 'activity/activity/' + id, - method: 'GET', - }), -}; + myGroupon: (params) => + request({ + url: 'activity/groupon/myGroupons', + method: 'GET', + params, + }), + getGrouponList: (params) => + request({ + url: 'activity/groupon', + method: 'GET', + params, + }), + grouponDetail: (id) => + request({ + url: 'activity/groupon/' + id, + method: 'GET', + }), + signList: (params) => + request({ + url: 'activity/signin', + method: 'GET', + params, + }), + signAdd: () => + request({ + url: '/app-api/member/sign-in/record/create', + method: 'POST', + }), + // signAdd: () => + // request({ + // url: 'activity/signin', + // method: 'POST', + // }), + replenish: (data) => + request({ + url: 'activity/signin/replenish', + method: 'POST', + data, + }), + activity: (id) => + request({ + url: 'activity/activity/' + id, + method: 'GET', + }), + getSummary: () => + request({ + url: '/app-api/member/sign-in/record/get-summary', + method: 'GET', + }), + +}; \ No newline at end of file diff --git a/sheep/api/trade.js b/sheep/api/trade.js index af9c335..5abf148 100644 --- a/sheep/api/trade.js +++ b/sheep/api/trade.js @@ -1,37 +1,46 @@ import request from '@/sheep/request'; export default { - order: (id) => - request({ - url: 'trade/order/' + id, - method: 'GET', - custom: { - showLoading: false, - }, - }), - orderLog: (params) => - request({ - url: 'trade/order', - method: 'GET', - params, - custom: { - showLoading: false, - }, - }), + order: (id) => + request({ + url: 'trade/order/' + id, + method: 'GET', + custom: { + showLoading: false, + }, + }), + orderLog: (params) => + request({ + url: 'trade/order', + method: 'GET', + params, + custom: { + showLoading: false, + }, + }), - rechargeRules: () => - request({ - url: 'trade/order/rechargeRules', - method: 'GET', - custom: { - showError: false, - showLoading: false, - }, - }), - recharge: (data) => - request({ - url: 'trade/order/recharge', - method: 'POST', - data, - }), -}; + rechargeRules: () => + request({ + url: 'trade/order/rechargeRules', + method: 'GET', + custom: { + showError: false, + showLoading: false, + }, + }), + rechargeRules2: () => + request({ + url: '/app-api/pay/wallet-recharge-package/list', + method: 'GET', + custom: { + showError: false, + showLoading: false, + }, + }), + recharge: (data) => + request({ + url: '/app-api/pay/wallet-recharge/create', + method: 'POST', + data, + }), +}; \ No newline at end of file diff --git a/sheep/components/s-share-modal/s-share-modal.vue b/sheep/components/s-share-modal/s-share-modal.vue index 83a4a27..87dc96f 100644 --- a/sheep/components/s-share-modal/s-share-modal.vue +++ b/sheep/components/s-share-modal/s-share-modal.vue @@ -1,19 +1,16 @@ + .share-title { + font-size: 24rpx; + color: $dark-6; + } + } + } + } + \ No newline at end of file