Browse Source

上传

master
前端-胡立永 4 months ago
parent
commit
7c1367e372
13 changed files with 124 additions and 83 deletions
  1. +6
    -4
      api/model/info.js
  2. +17
    -9
      pages/index/cart.vue
  3. +2
    -0
      pages/index/index.vue
  4. +8
    -1
      pages/index/member.vue
  5. +24
    -40
      pages/index/order.vue
  6. +2
    -2
      pages_order/components/address/addressList.vue
  7. +5
    -5
      pages_order/components/address/redactAddress.vue
  8. +1
    -1
      pages_order/home/journalism.vue
  9. +2
    -2
      pages_order/home/notice.vue
  10. +5
    -5
      pages_order/mine/address.vue
  11. +5
    -1
      pages_order/mine/balance.vue
  12. +22
    -10
      pages_order/mine/recharge.vue
  13. +25
    -3
      pages_order/mine/withdraw.vue

+ 6
- 4
api/model/info.js View File

@ -6,6 +6,12 @@ const api = {
getAddressPageList: {
url: '/rice_info/getAddressPageList',
method: 'GET',
auth : true,
},
// 增加或修改地址信息
addOrUpdateAddress: {
url: '/rice_info/addOrUpdateAddress',
method: 'GET',
limit : 500,
auth : true,
},
@ -13,28 +19,24 @@ const api = {
getCartPageList: {
url: '/rice_info/getCartPageList',
method: 'GET',
limit : 500,
auth : true,
},
// 获取粉丝列表带分页
getFansPageList: {
url: '/rice_info/getFansPageList',
method: 'GET',
limit : 500,
auth : true,
},
// 获取相关介绍
getInfoIntroduce: {
url: '/rice_info/getInfoIntroduce',
method: 'GET',
limit : 500,
auth : true,
},
// 获取个人邀请码
getInviteCode: {
url: '/rice_info/getInviteCode',
method: 'GET',
limit : 500,
auth : true,
},
// 获取订单列表带分页


+ 17
- 9
pages/index/cart.vue View File

@ -18,7 +18,7 @@
<view class="checkbox">
<uv-checkbox
:name="item.id"
activeColor="#FA5A0A"
activeColor="#A3D250"
size="40rpx"
icon-size="35rpx"
></uv-checkbox>
@ -35,18 +35,26 @@
<view class="">
{{ item.title }}
</view>
<view class="">
<uv-number-box v-model="item.num"
@change="valChange"></uv-number-box>
</view>
</view>
<view class="unit">
规格{{ item.sku }}
<uv-icon name="arrow-down"></uv-icon>
<!-- <uv-icon name="arrow-down"></uv-icon> -->
</view>
<view class="price">
<text>{{ item.price }}</text>
<view
style="display: flex;
justify-content: space-between;
align-items: center;">
<view class="price">
<text>{{ item.price }}</text>
</view>
<view class="">
<uv-number-box v-model="item.num"
@change="valChange"></uv-number-box>
</view>
</view>
</view>
</view>
</uv-swipe-action-item>
@ -99,7 +107,7 @@
{
text: '删除',
style: {
backgroundColor: '#FA5A0A'
backgroundColor: '#f40'
}
},
],


+ 2
- 0
pages/index/index.vue View File

@ -338,6 +338,8 @@
position: relative;
margin-left: 30rpx;
margin-bottom: 30rpx;
font-size: 34rpx;
font-weight: 900;
}
.search {


+ 8
- 1
pages/index/member.vue View File

@ -182,7 +182,14 @@
},
//
submitOpen(){
this.$api('applyRiceVip', res => {
if(res.code == 200){
uni.showToast({
title: '开通成功',
icon : 'none'
})
}
})
},
}
}


+ 24
- 40
pages/index/order.vue View File

@ -15,19 +15,19 @@
:current="current"
@click="clickTabs"></uv-tabs>
<view v-if="orderList.length > 0" class="list">
<view class="list">
<view class="item"
v-for="(item, index) in orderList.records"
v-for="(item, index) in list"
@click="toOrderDetail(item.id)"
:key="index">
<view class="top">
<view class="service">
<text>{{item.projectId_dictText}}</text>
<text>{{item.type_dictText}}</text>
<!-- <text>{{item.projectId_dictText}}</text>
<text>{{item.type_dictText}}</text> -->
</view>
<view class="status">
<text> {{item.state_dictText}}</text>
<text> {{ tabs[Number(item.state) + 1].name }}</text>
</view>
</view>
@ -39,13 +39,13 @@
<view class="right">
<view class="text-hidden-1">
客户姓名{{item.name}}
商品{{item.title}}
</view>
<view class="text-hidden-1">
产品规格{{item.unit}}
规格{{item.sku}}
</view>
<view class="text-hidden-1">
租赁地址{{item.address}}
数量{{item.num}}
</view>
<!-- <view class="text-hidden-1">
总计时间{{item.useTime}}分钟
@ -57,23 +57,23 @@
<view class="bottom">
<view class="price">
总价格<text class="num">{{item.money}}</text>
实付款<text class="num">{{item.price}}</text>
</view>
<view class="b1">
<!-- <view class="b1">
查看物流
</view>
<!-- <view @click.stop="toPayOrder(item)" class="b2" v-if="item.state == 0">
</view> -->
<view @click.stop="toPayOrder(item)" class="b2"
v-if="item.state == 0">
立即付款
</view>
<view class="b1" @click.stop="moreOrder(item.projectId,toPlaceorder)" v-if="item.state == 3">
再来一单
</view>
<view class="b2" @click.stop="toEvaluate(item.id,item.projectId,item.technicianId)" v-if="item.state == 3">
<view class="b2"
@click.stop=""
v-if="item.state == 3">
立即评价
</view>
<view class="b2" @click.stop="moreOrder(item.projectId,toPlaceorder)" v-if="item.state == 4">
再来一单
</view> -->
</view>
</view>
@ -112,32 +112,13 @@
name: '已完成'
}
],
queryParams: {
pageNo: 1,
pageSize: 10
},
// orderList: [
// {
// money : 99.99,
// address : '广广C32802',
// name : '**',
// phone : '150*****091',
// unit : '120*40*75',
// image : 'https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg',
// state_dictText : '',
// }
// ], //
orderList : {
records : [],
total : 0,
},
state : -1,
current : 0,
mixinsListApi : 'getOrderPageList',
}
},
onLoad(args) {
this.current = args.type || 0
this.clickTabs(this.current)
},
onShow() {
},
@ -233,8 +214,11 @@
}
.b2 {
background: linear-gradient(178deg, #4FD3BC, #60C285);
background: $uni-color;
color: #fff;
display: flex;
align-items: center;
justify-content: center;
}
view {


+ 2
- 2
pages_order/components/address/addressList.vue View File

@ -22,7 +22,7 @@
</view>
<view class="address-detail">
{{ item.address + " " + item.addressDetail }}
{{ item.address + " " + item.addressDetails }}
</view>
</view>
</view>
@ -148,7 +148,7 @@
padding: 0rpx 0rpx 15rpx 0rpx;
.img-box {
width: 120rpx;
width: 100rpx;
height: 120rpx;
image {


+ 5
- 5
pages_order/components/address/redactAddress.vue View File

@ -25,7 +25,7 @@
</uv-form-item>
<uv-form-item label="详细地址" prop="addressDetail">
<uv-input v-model="addressDetail.addressDetail" placeholder="请输入详细地址" border="none">
<uv-input v-model="addressDetail.addressDetails" placeholder="请输入详细地址" border="none">
</uv-input>
</uv-form-item>
</uv-form>
@ -71,13 +71,13 @@
this.$emit('saveOrUpdate', this.addressDetail)
},
//
parameterVerification(addressDetaila) {
parameterVerification(addressForm) {
let {
name,
phone,
address,
addressDetail
} = addressDetaila
addressDetails
} = addressForm
if (name.trim() == '') {
return {
title: '请填写联系人',
@ -93,7 +93,7 @@
title: '请填写所在地区',
auth: false
}
} else if (addressDetail.trim() == '') {
} else if (addressDetails.trim() == '') {
return {
title: '请填写详细地址',
auth: false


+ 1
- 1
pages_order/home/journalism.vue View File

@ -12,7 +12,7 @@
{{ item.title }}
</view>
<view class="text">
文本内容文本内容文本内容文本内容文本内容文本内容文本内容
{{ item.descValue }}
</view>
</view>
</view>


+ 2
- 2
pages_order/home/notice.vue View File

@ -1,7 +1,7 @@
<template>
<!-- 公告 -->
<view class="page">
<navbar title="公告" leftClick @leftClick="$utils.navigateBack" />
<navbar :title="title" leftClick @leftClick="$utils.navigateBack" />
<view style="padding: 20rpx;">
<uv-parse :content="notice"></uv-parse>
</view>
@ -14,7 +14,7 @@
return {
notice : {},
id : 0,
title : '',
title : '公告',
titles : ['公司介绍', '产品介绍', '关于我们', '其他'],
}
},


+ 5
- 5
pages_order/mine/address.vue View File

@ -77,8 +77,8 @@
name: addressDetail.name,
phone: addressDetail.phone,
address: addressDetail.address,
addressDetail: addressDetail.addressDetail,
defaultId: addressDetail.defaultId || '0',
addressDetails: addressDetail.addressDetails,
defaultFlag: addressDetail.defaultFlag || '0',
latitude: addressDetail.latitude,
longitude: addressDetail.longitude
}
@ -87,7 +87,7 @@
data.id = addressDetail.id
}
this.$api(data.id ? 'addressEdit' : 'addressAdd', data, res => {
this.$api('addOrUpdateAddress', data, res => {
if (res.code == 200) {
this.$refs.addressPopup.close()
this.getAddressList()
@ -151,8 +151,8 @@
name: '',
phone: '',
address: '',
addressDetail: '',
defaultId: '',
addressDetails: '',
defaultFlag: '',
latitude: '',
longitude: ''
})


+ 5
- 1
pages_order/mine/balance.vue View File

@ -13,7 +13,7 @@
我的余额
</view>
<view class="num">
16666
{{ riceInfo.balance || 0 }}
</view>
</view>
@ -43,6 +43,7 @@
<script>
import mixinsList from '@/mixins/list.js'
import { mapState } from 'vuex'
export default {
mixins : [mixinsList],
data() {
@ -53,6 +54,9 @@
state : ['审核中', '成功', '失败'],
}
},
computed: {
...mapState(['userInfo', 'riceInfo']),
},
onShow() {
this.$store.commit('getUserInfo')
this.$store.commit('getRiceInfo')


+ 22
- 10
pages_order/mine/recharge.vue View File

@ -18,7 +18,7 @@
</view>
</view>
<view class="num">
可充值金额16666
余额{{ riceInfo.balance || 0 }}
</view>
</view>
@ -29,7 +29,8 @@
</view>
</view>
<view class="uni-color-btn">
<view class="uni-color-btn"
@click="submit">
充值
</view>
@ -59,24 +60,35 @@
<script>
import mixinsList from '@/mixins/list.js'
import { mapState } from 'vuex'
export default {
mixins : [mixinsList],
data() {
return {
// mixinsListApi : 'getWaterPageList',
list : [
{
title : '直播收入',
type : 0,
createTime : '2021-12-12',
}
],
list : [],
type : ['-', '+'],
num : 0,
}
},
computed: {
...mapState(['userInfo', 'riceInfo']),
},
onShow() {
this.$store.commit('getUserInfo')
this.$store.commit('getRiceInfo')
},
methods: {
submit(){
this.$api('', res => {
if(res.code == 200){
uni.showToast({
title: '提现成功',
icon : 'none'
})
}
})
},
}
}
</script>


+ 25
- 3
pages_order/mine/withdraw.vue View File

@ -21,7 +21,7 @@
</view>
</view>
<view class="num">
可提现金额16666
可提现金额{{ riceInfo.canWithdraw || 0 }}
</view>
</view>
@ -32,6 +32,11 @@
</view>
</view>
<view class="uni-color-btn"
@click="submit">
提现
</view>
<view class="cell">
<view class="cell-top">提现记录</view>
<view class="cell-box"
@ -58,6 +63,7 @@
<script>
import mixinsList from '@/mixins/list.js'
import { mapState } from 'vuex'
export default {
mixins : [mixinsList],
data() {
@ -74,9 +80,25 @@
num : 0,
}
},
computed: {
...mapState(['userInfo', 'riceInfo']),
},
onShow() {
this.$store.commit('getUserInfo')
this.$store.commit('getRiceInfo')
},
methods: {
}
submit(){
this.$api('', res => {
if(res.code == 200){
uni.showToast({
title: '提现成功',
icon : 'none'
})
}
})
},
},
}
</script>


Loading…
Cancel
Save