longjieli
3 months ago
22 changed files with 445 additions and 548 deletions
Split View
Diff Options
-
+7 -7api/api.js
-
+7 -7api/http.js
-
+6 -1components/couponPopup/couponPopup.vue
-
+90 -52components/product/productItem.vue
-
+0 -195components/user/couponList.vue
-
+3 -0pages.json
-
+7 -12pages/index/category.vue
-
+9 -7pages/index/center.vue
-
+8 -1pages/index/index.vue
-
+61 -65pages/index/order.vue
-
+1 -3pages_order/auth/wxLogin.vue
-
+1 -1pages_order/auth/wxUserInfo.vue
-
+1 -1pages_order/mine/memberCenter.vue
-
+1 -1pages_order/mine/moreCommodity.vue
-
+6 -6pages_order/mine/partner.vue
-
+2 -2pages_order/mine/recruit.vue
-
+232 -184pages_order/mine/withdraw.vue
-
+2 -2pages_order/order/createOrder.vue
-
BINstatic/image/cart/1.png
-
BINstatic/image/cart/2.png
-
BINstatic/image/center/head-img.png
-
+1 -1uni_modules/uv-ui-tools/libs/css/color.scss
+ 7
- 7
api/api.js
View File
+ 7
- 7
api/http.js
View File
+ 6
- 1
components/couponPopup/couponPopup.vue
View File
+ 90
- 52
components/product/productItem.vue
View File
+ 0
- 195
components/user/couponList.vue
View File
| @ -1,195 +0,0 @@ | |||
| <template> | |||
| <scroll-view | |||
| scroll-y="true" | |||
| :style="{height: height}" | |||
| @scrolltolower="loadMoreData"> | |||
| <view class="list"> | |||
| <view class="item" | |||
| v-for="(item,index) in list" | |||
| @click="select(item)" | |||
| :key="index"> | |||
| <view class="price"> | |||
| <view class="num"> | |||
| <view class="icon"> | |||
| ￥ | |||
| </view> | |||
| {{ item.price }} | |||
| </view> | |||
| <view class="tiao"> | |||
| {{ item.useType_dictText }}满{{ item.conditionPrice }}可用 | |||
| </view> | |||
| </view> | |||
| <view class="date"> | |||
| <view> | |||
| 有效期{{ item.endTime || '不限' }} | |||
| </view> | |||
| <view> | |||
| {{ item.type_dictText }}使用 | |||
| </view> | |||
| </view> | |||
| <view class="status"> | |||
| <!-- 已 使 用 --> | |||
| <!-- 立 即 使 用 --> | |||
| {{ item.status_dictText }} | |||
| </view> | |||
| <view class="del" | |||
| v-if="isSelect(item)"> | |||
| </view> | |||
| </view> | |||
| </view> | |||
| <uv-empty | |||
| v-if="list.length == 0" | |||
| text="空空如也" | |||
| textSize="30rpx" | |||
| iconSize="200rpx" | |||
| icon="list"></uv-empty> | |||
| </scroll-view> | |||
| </template> | |||
| <script> | |||
| import mixinList from '@/mixins/list.js' | |||
| export default { | |||
| name:"couponList", | |||
| mixins : [mixinList], | |||
| props : { | |||
| height : { | |||
| default : 'auto' | |||
| // default : 'calc(90vh - 180rpx)' | |||
| }, | |||
| // 押金 | |||
| depositPrice : { | |||
| }, | |||
| washPrice: {//水洗费 | |||
| }, | |||
| rentPrice: {//租金 | |||
| }, | |||
| }, | |||
| data() { | |||
| return { | |||
| mixinsListApi : 'couponPage' | |||
| }; | |||
| }, | |||
| methods : { | |||
| select(item){ | |||
| if(this.isSelect(item)){ | |||
| return | |||
| } | |||
| this.$emit('select', item) | |||
| }, | |||
| isSelect(item){ | |||
| if(!this.depositPrice && !this.rentPrice && !this.washPrice){ | |||
| return false | |||
| } | |||
| // 押金 | |||
| if(this.depositPrice && | |||
| item.useType == 0 && | |||
| this.depositPrice >= item.conditionPrice){ | |||
| return false | |||
| } | |||
| // 租金 | |||
| if(this.rentPrice && | |||
| item.useType == 1 && | |||
| this.rentPrice >= item.conditionPrice){ | |||
| return false | |||
| } | |||
| // 水洗 | |||
| if(this.washPrice && | |||
| item.useType == 2 && | |||
| this.washPrice >= item.conditionPrice){ | |||
| return false | |||
| } | |||
| return true | |||
| }, | |||
| } | |||
| } | |||
| </script> | |||
| <style scoped lang="scss"> | |||
| .list{ | |||
| .item{ | |||
| color: #4FD3BC; | |||
| position: relative; | |||
| width: calc(100% - 40rpx); | |||
| height: 220rpx; | |||
| background: url(../../static/image/coupon/c.png); | |||
| background-size: 100% 100%; | |||
| margin: 20rpx; | |||
| box-sizing: border-box; | |||
| padding: 30rpx; | |||
| .status{ | |||
| position: absolute; | |||
| right: 20rpx; | |||
| top: 20rpx; | |||
| height: calc(100% - 40rpx); | |||
| width: 60rpx; | |||
| writing-mode:vertical-rl; | |||
| box-sizing: border-box; | |||
| padding: 20rpx; | |||
| background-color: #fff; | |||
| border-radius: 60rpx; | |||
| font-size: 26rpx; | |||
| display: flex; | |||
| justify-content: center; | |||
| align-items: center; | |||
| } | |||
| .price{ | |||
| display: flex; | |||
| align-items: center; | |||
| .num{ | |||
| color: #4FD3BC; | |||
| font-weight: 900; | |||
| font-size: 70rpx; | |||
| display: flex; | |||
| align-items: flex-end; | |||
| .icon{ | |||
| color: #fff; | |||
| background-color: #4FD3BC; | |||
| width: 30rpx; | |||
| height: 30rpx; | |||
| display: flex; | |||
| justify-content: center; | |||
| align-items: center; | |||
| font-size: 20rpx; | |||
| border-radius: 14rpx; | |||
| margin-bottom: 14rpx; | |||
| margin-right: 10rpx; | |||
| } | |||
| } | |||
| .tiao{ | |||
| padding: 10rpx 20rpx; | |||
| background-color: #9ee3d1; | |||
| color: #25a28c; | |||
| font-size: 22rpx; | |||
| margin-left: 20rpx; | |||
| border-radius: 10rpx; | |||
| } | |||
| } | |||
| .date{ | |||
| display: flex; | |||
| font-size: 24rpx; | |||
| view{ | |||
| margin-right: 20rpx; | |||
| } | |||
| } | |||
| } | |||
| .del{ | |||
| position: absolute; | |||
| top: 0; | |||
| left: 0; | |||
| width: 100%; | |||
| height: 100%; | |||
| background-color: #ffffff99; | |||
| z-index: 99; | |||
| } | |||
| } | |||
| </style> | |||
+ 3
- 0
pages.json
View File
+ 7
- 12
pages/index/category.vue
View File
+ 9
- 7
pages/index/center.vue
View File
+ 8
- 1
pages/index/index.vue
View File
+ 61
- 65
pages/index/order.vue
View File
+ 1
- 3
pages_order/auth/wxLogin.vue
View File
+ 1
- 1
pages_order/auth/wxUserInfo.vue
View File
+ 1
- 1
pages_order/mine/memberCenter.vue
View File
+ 1
- 1
pages_order/mine/moreCommodity.vue
View File
+ 6
- 6
pages_order/mine/partner.vue
View File
+ 2
- 2
pages_order/mine/recruit.vue
View File
+ 232
- 184
pages_order/mine/withdraw.vue
View File
| @ -1,236 +1,284 @@ | |||
| <template> | |||
| <view class="page"> | |||
| <navbar title="提现" | |||
| bgColor="#A3D250" | |||
| color="#fff" | |||
| leftClick | |||
| @leftClick="$utils.navigateBack" /> | |||
| <view class="bg"/> | |||
| <view class="price"> | |||
| <!-- <view class="title"> | |||
| 请输入提现金额（元） | |||
| </view> --> | |||
| <view class="input-box"> | |||
| <view class="input"> | |||
| <input type="number" v-model="form.money" | |||
| placeholder="请输入提现金额"/> | |||
| </view> | |||
| <view class="" | |||
| @click="selectAll"> | |||
| 全部提现 | |||
| </view> | |||
| <!-- 导航栏 --> | |||
| <navbar title="提现" leftClick @leftClick="$utils.navigateBack" bgColor="#E3441A" color="#fff" /> | |||
| <!-- 佣金信息 --> | |||
| <view class="b-relative center font-m"> | |||
| <image src="@/pages_order/static/withdraw/cz.png" /> | |||
| <view class="user-money"> | |||
| <view class="title">总佣金</view> | |||
| <view class="money">999999元</view> | |||
| </view> | |||
| <view class="input-box"> | |||
| <view class="input"> | |||
| <input type="text" v-model="form.bankName" | |||
| placeholder="请输入开户行"/> | |||
| <view class="operation"> | |||
| <view class="operation-item"> | |||
| 余额记录 | |||
| </view> | |||
| </view> | |||
| <view class="input-box"> | |||
| <view class="input"> | |||
| <input type="text" v-model="form.bankNo" | |||
| placeholder="请输入银行卡号"/> | |||
| | | |||
| <view class="operation-item"> | |||
| 提现记录 | |||
| </view> | |||
| | | |||
| <view class="operation-item"> | |||
| 佣金记录 | |||
| </view> | |||
| </view> | |||
| <view class="num"> | |||
| 可提现金额：{{ riceInfo.canWithdraw || 0 }} | |||
| </view> | |||
| </view> | |||
| <view class="cell"> | |||
| <view class="cell-top">提现说明</view> | |||
| <view style="padding: 0 20rpx;"> | |||
| <uv-parse :content="configList.withdrawal_instructions"></uv-parse> | |||
| <!-- 我要提现 --> | |||
| <view class="from-body"> | |||
| <view>我要提现</view> | |||
| <view class="money"> | |||
| <van-cell-group inset> | |||
| <van-field type="number" v-model="form.price" placeholder="请输入提现金额" | |||
| style="background-color: #F5F5F5; margin: 10rpx 0px; border-radius: 20px;" /> | |||
| <van-field v-model="form.bank" placeholder="请输入开户行" | |||
| style="background-color: #F5F5F5; margin: 10rpx 0px; border-radius: 20px;" /> | |||
| <van-field v-model="form.card" placeholder="请输入卡号" | |||
| style="background-color: #F5F5F5; margin: 10rpx 0px; border-radius: 20px;" /> | |||
| </van-cell-group> | |||
| </view> | |||
| <view v-html="withdrawalStatement" class="withdrawal-statement"></view> | |||
| </view> | |||
| <view class="uni-color-btn" | |||
| @click="submit"> | |||
| 提现 | |||
| </view> | |||
| <view class="cell"> | |||
| <view class="cell-top">提现记录</view> | |||
| <view class="cell-box" | |||
| :key="index" | |||
| v-for="(item,index) in list"> | |||
| <uv-cell-group> | |||
| <uv-cell | |||
| :title="item.title" | |||
| :label="item.createTime" | |||
| :center="true"> | |||
| <template #value> | |||
| <view class="cell-text"> | |||
| <view class="price-text" | |||
| v-if="item.type">{{ type[item.type] }}{{ item.money }}</view> | |||
| <view class="price-text add" | |||
| v-else>{{ type[item.type] }}{{ item.money }}</view> | |||
| <view class="tips">{{ state[item.state] }}</view> | |||
| </view> | |||
| </template> | |||
| </uv-cell> | |||
| </uv-cell-group> | |||
| <view class="recharge"> | |||
| <view @click="withdraw" class="btn"> | |||
| 立即提现 | |||
| </view> | |||
| </view> | |||
| </view> | |||
| </template> | |||
| <script> | |||
| import mixinsList from '@/mixins/list.js' | |||
| import { mapState } from 'vuex' | |||
| import { | |||
| mapState | |||
| } from 'vuex' | |||
| export default { | |||
| mixins : [mixinsList], | |||
| mixins: [mixinsList], | |||
| data() { | |||
| return { | |||
| mixinsListApi : 'getWaterPageList', | |||
| list : [], | |||
| type : ['+', '-'], | |||
| state : ['未到账', '已到账'], | |||
| form : { | |||
| money : '', | |||
| bankNo : '', | |||
| bankName : '', | |||
| mixinsListApi: 'getWaterPageList', | |||
| list: [], | |||
| type: ['+', '-'], | |||
| state: ['未到账', '已到账'], | |||
| form: { | |||
| money: '', | |||
| bankNo: '', | |||
| bankName: '', | |||
| }, | |||
| } | |||
| }, | |||
| computed: { | |||
| ...mapState(['userInfo', 'riceInfo']), | |||
| }, | |||
| data() { | |||
| return { | |||
| withdrawalStatement: '', //充值说明 | |||
| form: { | |||
| type: 1, | |||
| price: undefined, | |||
| bank: '', | |||
| card: '' | |||
| }, | |||
| } | |||
| }, | |||
| onShow() { | |||
| this.$store.commit('getUserInfo') | |||
| this.$store.commit('getRiceInfo') | |||
| this.getConfig() | |||
| this.getUserInfo() | |||
| this.getTenRealName() | |||
| }, | |||
| methods: { | |||
| selectAll(){ | |||
| this.form.money = this.riceInfo.canWithdraw | |||
| getConfig() { //获取配置信息 | |||
| this.$api('getConfig', {}, res => { | |||
| if (res.code == 200) { | |||
| res.result.forEach(item => { | |||
| if (item.keyValue === 'withdraw') { | |||
| this.withdrawalStatement = item.content | |||
| } | |||
| }) | |||
| } | |||
| }) | |||
| }, | |||
| submit(){ | |||
| if(this.$utils.verificationAll(this.form, { | |||
| money : '请输入金额', | |||
| bankName : '请输入开户行', | |||
| bankNo : 'bankNo', | |||
| })){ | |||
| return | |||
| } | |||
| if(this.form.money <= 0){ | |||
| uni.showToast({ | |||
| title: '输入金额必须大于0', | |||
| withdraw() { //立即提现 | |||
| let isOk = this.parameterVerification(); | |||
| if (isOk && !isOk.auth) { | |||
| return uni.showToast({ | |||
| title: isOk.title, | |||
| icon: 'none' | |||
| }) | |||
| return | |||
| } | |||
| this.$api('withdraw', this.form, res => { | |||
| if(res.code == 200){ | |||
| this.$api('recharge', this.form, res => { | |||
| if (res.code == 200) { | |||
| uni.showToast({ | |||
| title: '提现成功', | |||
| icon : 'none' | |||
| icon: 'none' | |||
| }) | |||
| this.form.money = '' | |||
| this.$store.commit('getUserInfo') | |||
| this.$store.commit('getRiceInfo') | |||
| this.getData() | |||
| this.getUserInfo() | |||
| } | |||
| }) | |||
| }, | |||
| }, | |||
| getTenRealName() { //获取技师实名认证 | |||
| this.$api('getTenRealName', {}, res => { | |||
| if (res.code == 200) { | |||
| let result = res.result; | |||
| if (result && result.bank && result.card) { | |||
| this.form.bank = result.bank | |||
| this.form.card = result.card | |||
| } | |||
| } | |||
| }) | |||
| }, | |||
| parameterVerification() { //验证用户参数合法性 | |||
| let { | |||
| price, | |||
| bank, | |||
| card | |||
| } = this.form | |||
| if (!price) { | |||
| return { | |||
| title: '请填写提现金额', | |||
| auth: false | |||
| } | |||
| } else if (price <= 0) { | |||
| return { | |||
| title: '提现金额必须大于0', | |||
| auth: false | |||
| } | |||
| } else if (price > this.userInfo.price) { | |||
| return { | |||
| title: '提现金额大于余额', | |||
| auth: false | |||
| } | |||
| } else if (bank.trim() == '') { | |||
| return { | |||
| title: '请填写开户行', | |||
| auth: false | |||
| } | |||
| } else if (card.trim() == '') { | |||
| return { | |||
| title: '请填写卡号', | |||
| auth: false | |||
| } | |||
| } | |||
| return { | |||
| title: '验证通过', | |||
| auth: true | |||
| } | |||
| } | |||
| } | |||
| } | |||
| </script> | |||
| <style scoped lang="scss"> | |||
| .page{ | |||
| .bg{ | |||
| background-color: $uni-color; | |||
| height: 640rpx; | |||
| position: absolute; | |||
| left: 0; | |||
| width: 100%; | |||
| z-index: -1; | |||
| border-bottom-left-radius: 30rpx; | |||
| border-bottom-right-radius: 30rpx; | |||
| } | |||
| .price{ | |||
| color: #FFFFFF; | |||
| padding: 40rpx; | |||
| .title{ | |||
| color: #eee; | |||
| font-size: 28rpx; | |||
| .page { | |||
| // 佣金信息 | |||
| .center { | |||
| position: relative; | |||
| width: 710rpx; | |||
| height: 316rpx; | |||
| margin: 20rpx auto; | |||
| } | |||
| .input-box{ | |||
| background-color: #FFFFFF; | |||
| color: $uni-color; | |||
| .center image { | |||
| position: absolute; | |||
| left: 0; | |||
| top: 0; | |||
| width: 710rpx; | |||
| height: 316rpx; | |||
| border-radius: 12rpx; | |||
| } | |||
| .center .user-money { | |||
| position: absolute; | |||
| top: 50%; | |||
| transform: translateY(-50%); | |||
| z-index: 9; | |||
| color: white; | |||
| padding-left: 50rpx; | |||
| box-sizing: border-box; | |||
| .title { | |||
| font-size: 36rpx; | |||
| } | |||
| .money { | |||
| font-size: 40rpx; | |||
| } | |||
| } | |||
| .operation { | |||
| position: absolute; | |||
| bottom: 20rpx; | |||
| left: 0rpx; | |||
| width: 100%; | |||
| display: flex; | |||
| justify-content: center; | |||
| border-radius: 30rpx; | |||
| align-items: center; | |||
| padding: 10rpx; | |||
| margin: 20rpx 0; | |||
| .input{ | |||
| color: #000; | |||
| // font-size: 40rpx; | |||
| // font-weight: 900; | |||
| display: flex; | |||
| flex: 1; | |||
| input{ | |||
| flex: 1; | |||
| padding: 14rpx 20rpx; | |||
| } | |||
| color: white; | |||
| .operation-item { | |||
| margin: 0rpx 20rpx; | |||
| } | |||
| } | |||
| .num{ | |||
| font-size: 30rpx; | |||
| font-weight: 900; | |||
| margin-top: 10rpx; | |||
| // 我要提现 | |||
| .from-body { | |||
| padding: 40rpx 20rpx; | |||
| font-size: 28rpx; | |||
| text-align: left; | |||
| color: #333333; | |||
| } | |||
| } | |||
| .cell { | |||
| margin: 20rpx; | |||
| background-color: #FFFFFF; | |||
| border-radius: 16rpx; | |||
| .cell-top { | |||
| padding: 40rpx 34rpx; | |||
| color: #474747; | |||
| font-size: 34rpx; | |||
| font-weight: 600; | |||
| position: relative; | |||
| &::after{ | |||
| content: ''; | |||
| display: block; | |||
| position: absolute; | |||
| left: 55rpx; | |||
| bottom: 38rpx; | |||
| height: 10rpx; | |||
| width: 120rpx; | |||
| background: linear-gradient(to right, #fff, $uni-color); | |||
| } | |||
| .money { | |||
| margin: 20rpx 0rpx; | |||
| } | |||
| .cell-text{ | |||
| text-align: right; | |||
| .price-text{ | |||
| font-size: 32rpx; | |||
| font-weight: 900; | |||
| } | |||
| .add{ | |||
| color: #f40; | |||
| } | |||
| .tips{ | |||
| font-size: 22rpx; | |||
| color: #aaa; | |||
| margin-top: 10rpx; | |||
| .money .van-cell-group--inset { | |||
| margin: 0; | |||
| } | |||
| .money .van-field { | |||
| padding: auto 0rpx; | |||
| margin-bottom: 30rpx !important; | |||
| } | |||
| .recharge { | |||
| position: fixed; | |||
| display: flex; | |||
| justify-content: center; | |||
| align-items: center; | |||
| left: 0; | |||
| bottom: 0; | |||
| width: 750rpx; | |||
| height: 100rpx; | |||
| background: white; | |||
| } | |||
| .recharge .btn { | |||
| width: 85%; | |||
| height: 80rpx; | |||
| border-radius: 40rpx; | |||
| color: white; | |||
| text-align: center; | |||
| line-height: 80rpx; | |||
| font-size: 28rpx; | |||
| background: $uni-color; | |||
| } | |||
| @media all and (min-width: 961px) { | |||
| .recharge { | |||
| left: 50% !important; | |||
| transform: translateX(-50%); | |||
| } | |||
| } | |||
| } | |||
| } | |||
| </style> | |||
| </style> | |||
+ 2
- 2
pages_order/order/createOrder.vue
View File
BIN
static/image/cart/1.png
View File
| Before | After |
|---|---|
|
|
| Width: 36 | Height: 36 | Size: 1.9 KiB |
BIN
static/image/cart/2.png
View File
| Before | After |
|---|---|
|
|
| Width: 72 | Height: 72 | Size: 5.4 KiB |
BIN
static/image/center/head-img.png
View File
| Before | After |
|---|---|
|
|
| Width: 60 | Height: 60 | Size: 2.9 KiB | Width: 60 | Height: 60 | Size: 2.4 KiB |