Browse Source
feat: 新增快捷下单组件并优化订单相关功能
- 新增 `QuickOrderEntry` 组件，用于快捷下单入口 - 优化订单页面逻辑，支持订单状态筛选和操作 - 新增地址管理功能，支持地址的增删改查 - 优化支付流程，支持微信支付 - 修复部分样式问题，提升用户体验master
28 changed files with 2051 additions and 1050 deletions
Split View
Diff Options
-
+1 -1.cursor/rules/md.mdc
-
+11 -0api/model/index.js
-
+207 -0components/QuickOrderEntry.vue
-
+2 -1components/config/customerServicePopup.vue
-
+4 -1components/userShop/userShopCommission.vue
-
+1 -1config.js
-
+2 -2mixins/order.js
-
+22 -8pages.json
-
+9 -11pages/index/center.vue
-
+31 -71pages/index/index.vue
-
+229 -231pages/index/order.vue
-
+5 -5pages_order/auth/wxUserInfo.vue
-
+0 -1pages_order/components/address/addressList.vue
-
+10 -6pages_order/components/address/redactAddress.vue
-
+227 -0pages_order/components/address/redactAddressForm.vue
-
+36 -0pages_order/mine/about.vue
-
+3 -2pages_order/mine/address.vue
-
+33 -9pages_order/mine/individualTeam.vue
-
+7 -1pages_order/mine/purse.vue
-
+203 -173pages_order/mine/runningWater.vue
-
+6 -6pages_order/order/createOrder.vue
-
+444 -2pages_order/order/firmOrder.vue
-
+518 -507pages_order/order/orderDetail.vue
-
+12 -10pages_order/order/voiceOrder.vue
-
BINpages_order/static/address/icon.png
-
BINstatic/image/center/10.png
-
BINstatic/image/center/headImage.png
-
+28 -1utils/index.js
+ 1
- 1
.cursor/rules/md.mdc
View File
| @ -1,7 +1,7 @@ | |||
| --- | |||
| description: | |||
| globs: | |||
| alwaysApply: false | |||
| alwaysApply: true | |||
| --- | |||
| 请你写代码之前先查看一下README.md文件，按照这个文件中说的写 | |||
+ 11
- 0
api/model/index.js
View File
+ 207
- 0
components/QuickOrderEntry.vue
View File
| @ -0,0 +1,207 @@ | |||
| <template> | |||
| <view class="quick-order-container" @click="handleClick"> | |||
| <view class="new-message" v-if="innerHasNewMessage"> | |||
| 你有新的快捷下单信息 | |||
| </view> | |||
| <view class="quick-order"> | |||
| <view class="number-order" v-if="innerMessageCount > 0"> | |||
| {{ innerMessageCount }} | |||
| </view> | |||
| <image :src="imageUrl" mode=""></image> | |||
| </view> | |||
| </view> | |||
| </template> | |||
| <script> | |||
| export default { | |||
| name: 'QuickOrderEntry', | |||
| props: { | |||
| // 图标路径 | |||
| imageUrl: { | |||
| type: String, | |||
| default: '/static/image/home/7.png' | |||
| }, | |||
| // 点击跳转的页面 | |||
| targetUrl: { | |||
| type: String, | |||
| default: '/pages_order/order/fastCreateOrder' | |||
| }, | |||
| // 是否自动获取快捷下单信息 | |||
| autoFetch: { | |||
| type: Boolean, | |||
| default: true | |||
| } | |||
| }, | |||
| data() { | |||
| return { | |||
| orderInfo: null, | |||
| innerHasNewMessage: false, | |||
| innerMessageCount: 0, | |||
| isInitialized: false | |||
| } | |||
| }, | |||
| methods: { | |||
| // 处理点击事件 | |||
| handleClick() { | |||
| // 发出点击事件，便于父组件监听 | |||
| this.$emit('click'); | |||
| // 如果有订单信息，提供订单列表 | |||
| if (Array.isArray(this.orderInfo) && this.orderInfo.length > 0) { | |||
| this.$emit('order-info', this.orderInfo); | |||
| } | |||
| if(this.orderInfo.length > 0){ | |||
| this.navigateTo('/pages_order/order/firmOrder'); | |||
| return | |||
| } | |||
| // 如果有目标页面，则跳转 | |||
| if (this.targetUrl) { | |||
| this.navigateTo(this.targetUrl); | |||
| } | |||
| }, | |||
| // 获取快捷下单的信息 | |||
| getQuickOrderInfo() { | |||
| // 调用接口获取快捷下单信息 | |||
| this.$api('getOrderInfo', {}, res => { | |||
| if (res.code === 200 && res.result) { | |||
| // 处理返回的订单列表 | |||
| const orderList = Array.isArray(res.result) ? res.result : [res.result]; | |||
| if (orderList.length > 0) { | |||
| // 保存订单列表 | |||
| this.orderInfo = orderList; | |||
| // 设置消息数量为订单列表长度 | |||
| this.innerHasNewMessage = true; | |||
| this.innerMessageCount = orderList.length; | |||
| // 通知父组件获取到了数据 | |||
| this.$emit('order-loaded', this.orderInfo); | |||
| } else { | |||
| this.innerHasNewMessage = false; | |||
| this.innerMessageCount = 0; | |||
| this.orderInfo = []; | |||
| } | |||
| } else { | |||
| this.innerHasNewMessage = false; | |||
| this.innerMessageCount = 0; | |||
| this.orderInfo = []; | |||
| } | |||
| this.isInitialized = true; | |||
| }, err => { | |||
| console.error('获取快捷下单信息失败', err); | |||
| this.innerHasNewMessage = false; | |||
| this.innerMessageCount = 0; | |||
| this.orderInfo = []; | |||
| this.isInitialized = true; | |||
| }); | |||
| }, | |||
| // 导航到指定页面 | |||
| navigateTo(url) { | |||
| // 如果有订单列表，则优先使用第一个订单的ID | |||
| if (Array.isArray(this.orderInfo) && this.orderInfo.length > 0 && this.orderInfo[0].id && url.indexOf('?') === -1) { | |||
| url += `?orderId=${this.orderInfo[0].id}`; | |||
| } | |||
| this.$utils.navigateTo(url); | |||
| }, | |||
| // 刷新快捷下单信息 | |||
| refresh() { | |||
| this.getQuickOrderInfo(); | |||
| return this; // 链式调用 | |||
| }, | |||
| // 清除消息提示 | |||
| clearMessage() { | |||
| this.innerHasNewMessage = false; | |||
| this.innerMessageCount = 0; | |||
| return this; // 链式调用 | |||
| }, | |||
| // 检查是否有新消息 | |||
| hasNewMessage() { | |||
| return this.innerHasNewMessage; | |||
| }, | |||
| // 获取消息数量 | |||
| getMessageCount() { | |||
| return this.innerMessageCount; | |||
| }, | |||
| // 获取当前订单信息 | |||
| getOrderInfo() { | |||
| return this.orderInfo; | |||
| } | |||
| }, | |||
| } | |||
| </script> | |||
| <style scoped lang="scss"> | |||
| .quick-order-container { | |||
| position: fixed; | |||
| right: 30rpx; | |||
| bottom: 30vh; | |||
| z-index: 99; | |||
| transition: transform 0.3s; | |||
| &:active { | |||
| transform: scale(0.95); | |||
| } | |||
| .new-message { | |||
| position: absolute; | |||
| top: 50rpx; | |||
| right: 100%; | |||
| white-space: nowrap; | |||
| background-color: #DC2828; | |||
| border-radius: 20rpx; | |||
| font-size: 25rpx; | |||
| color: #ffffff; | |||
| padding: 5rpx 15rpx; | |||
| margin-bottom: 10rpx; | |||
| box-shadow: 0 5rpx 10rpx rgba(220, 40, 40, 0.3); | |||
| animation: pulse 2s infinite; | |||
| } | |||
| .quick-order { | |||
| position: relative; | |||
| width: 230rpx; | |||
| height: 160rpx; | |||
| image { | |||
| width: 100%; | |||
| height: 100%; | |||
| } | |||
| .number-order { | |||
| background-color: #DC2828; | |||
| position: absolute; | |||
| font-size: 30rpx; | |||
| height: 40rpx; | |||
| width: 40rpx; | |||
| text-align: center; | |||
| border-radius: 20rpx; | |||
| color: #ffffff; | |||
| top: 10rpx; | |||
| left: 25rpx; | |||
| } | |||
| } | |||
| } | |||
| @keyframes pulse { | |||
| 0% { | |||
| transform: scale(1); | |||
| } | |||
| 50% { | |||
| transform: scale(1.05); | |||
| } | |||
| 100% { | |||
| transform: scale(1); | |||
| } | |||
| } | |||
| </style> | |||
+ 2
- 1
components/config/customerServicePopup.vue
View File
+ 4
- 1
components/userShop/userShopCommission.vue
View File
+ 1
- 1
config.js
View File
+ 2
- 2
mixins/order.js
View File
+ 22
- 8
pages.json
View File
+ 9
- 11
pages/index/center.vue
View File
+ 31
- 71
pages/index/index.vue
View File
+ 229
- 231
pages/index/order.vue
View File
| @ -1,239 +1,237 @@ | |||
| <template> | |||
| <view class="page"> | |||
| <navbar title="订单中心" bgColor="#DC2828" color="#fff" leftClick @leftClick="$utils.navigateBack" /> | |||
| <uv-tabs :list="tabs" | |||
| :activeStyle="{color : '#FD5100', fontWeight : 600}" | |||
| lineColor="#FD5100" | |||
| lineHeight="8rpx" | |||
| lineWidth="50rpx" | |||
| :scrollable="false" | |||
| @click="clickTabs"></uv-tabs> | |||
| <view v-if="orderList.records.length > 0" class="list"> | |||
| <view class="item" v-for="(item, index) in orderList.records" @click="toOrderDetail(item.id)" :key="index"> | |||
| <!-- 顶部 --> | |||
| <view class="top"> | |||
| <view class="service"> | |||
| <text>{{item.projectId_dictText}}</text> | |||
| <text>{{item.type_dictText}}</text> | |||
| </view> | |||
| <view class="status"> | |||
| <text> {{item.state_dictText}}</text> | |||
| </view> | |||
| </view> | |||
| <!-- 中 --> | |||
| <view class="content"> | |||
| <view class="left"> | |||
| <image mode="aspectFill" :src="item.image"></image> | |||
| </view> | |||
| <view class="right"> | |||
| <view class="text-hidden-1"> | |||
| 客户姓名：{{item.name}} | |||
| </view> | |||
| <view class="text-hidden-1"> | |||
| 下单时间：{{item.unit}} | |||
| </view> | |||
| <view class="text-hidden-1"> | |||
| 联系电话：{{item.address}} | |||
| </view> | |||
| </view> | |||
| </view> | |||
| <!-- 底 --> | |||
| <view class="bottom"> | |||
| <view class="price"> | |||
| 总价格：<text class="num">￥{{item.money}}元</text> | |||
| </view> | |||
| <view class="b1"> | |||
| 查看详情 | |||
| </view> | |||
| </view> | |||
| </view> | |||
| </view> | |||
| </view> | |||
| <view class="page"> | |||
| <navbar title="订单中心" bgColor="#DC2828" color="#fff" leftClick @leftClick="$utils.navigateBack" /> | |||
| <uv-tabs :list="tabs" :activeStyle="{ color: '#FD5100', fontWeight: 600 }" lineColor="#FD5100" lineHeight="8rpx" | |||
| lineWidth="50rpx" :scrollable="false" @click="clickTabs"></uv-tabs> | |||
| <view v-if="orderList.records.length > 0" class="list"> | |||
| <view class="item" v-for="(item, index) in orderList.records" @click="toOrderDetail(item.id)" :key="index"> | |||
| <!-- 顶部 --> | |||
| <view class="top"> | |||
| <view class="service"> | |||
| <text>{{ item.title }}</text> | |||
| <!-- <text>{{ item.type_dictText }}</text> --> | |||
| </view> | |||
| <view class="status"> | |||
| <text> {{ tabs[item.status - 1 + 2].name }}</text> | |||
| </view> | |||
| </view> | |||
| <!-- 中 --> | |||
| <view class="content"> | |||
| <view class="left"> | |||
| <image mode="aspectFill" :src="item.image"></image> | |||
| </view> | |||
| <view class="right"> | |||
| <view class="text-hidden-1"> | |||
| 客户姓名：{{ item.name }} | |||
| </view> | |||
| <view class="text-hidden-1"> | |||
| 下单时间：{{ item.createTime }} | |||
| </view> | |||
| <view class="text-hidden-1"> | |||
| 联系电话：{{ item.phone }} | |||
| </view> | |||
| </view> | |||
| </view> | |||
| <!-- 底 --> | |||
| <view class="bottom"> | |||
| <view class="price"> | |||
| 总价格：<text class="num">￥{{ item.price }}元</text> | |||
| </view> | |||
| <view class="b2" v-if="item.status == 0" @click.stop="toPayOrder(item)"> | |||
| 立即支付 | |||
| </view> | |||
| <view class="b2" v-if="item.status == 1" @click.stop="confirmOrder(item)"> | |||
| 确认收货 | |||
| </view> | |||
| <view class="b1" v-if="item.status == 0" @click.stop="cancelOrder(item)"> | |||
| 取消订单 | |||
| </view> | |||
| <!-- <view class="b1" v-if="item.status != 0"> | |||
| 联系客服 | |||
| </view> --> | |||
| </view> | |||
| </view> | |||
| </view> | |||
| </view> | |||
| </template> | |||
| <script> | |||
| import { mapGetters } from 'vuex' | |||
| export default { | |||
| components : { | |||
| }, | |||
| computed : { | |||
| ...mapGetters(['userShop']), | |||
| }, | |||
| data() { | |||
| return { | |||
| tabs: [{ | |||
| name: '全部' | |||
| }, | |||
| { | |||
| name: '待付款' | |||
| }, | |||
| { | |||
| name: '配送中' | |||
| }, | |||
| { | |||
| name: '已完成' | |||
| }, | |||
| { | |||
| name: '已取消' | |||
| } | |||
| ], | |||
| queryParams: { | |||
| pageNo: 1, | |||
| pageSize: 10 | |||
| }, | |||
| orderList : { | |||
| records : [ | |||
| { | |||
| projectId_dictText:"泰山工装石膏板", | |||
| money : 99.99, | |||
| address : '广东省广州市越秀区城南故事C3栋2802', | |||
| name : '李**', | |||
| phone : '150*****091', | |||
| unit : '120*40*75【桌子尺寸】', | |||
| image : 'https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg', | |||
| state_dictText : '已完成', | |||
| } | |||
| ], | |||
| total : 0, | |||
| }, | |||
| state : -1, | |||
| } | |||
| }, | |||
| onShow() { | |||
| this.orderPage() | |||
| }, | |||
| //滚动到屏幕底部 | |||
| onReachBottom() { | |||
| if(this.queryParams.pageSize < this.orderList.total){ | |||
| this.queryParams.pageSize += 10 | |||
| this.orderPage() | |||
| } | |||
| }, | |||
| methods: { | |||
| orderPage(){ | |||
| let queryParams = { | |||
| ...this.queryParams, | |||
| } | |||
| if(this.state != -1){ | |||
| queryParams.state = this.state | |||
| } | |||
| this.$api('orderPage', queryParams, res => { | |||
| if(res.code == 200){ | |||
| this.orderList = res.result | |||
| } | |||
| }) | |||
| }, | |||
| //点击tab栏 | |||
| clickTabs(index) { | |||
| if (index == 0) { | |||
| this.state = -1; | |||
| } else { | |||
| this.state = index - 1; | |||
| } | |||
| this.queryParams.pageSize = 10 | |||
| this.orderPage() | |||
| }, | |||
| //跳转订单详情页面 | |||
| toOrderDetail(id) { | |||
| uni.navigateTo({ | |||
| url: '/pages_order/order/orderDetail?id=' + id | |||
| }) | |||
| }, | |||
| getOrderList(){ | |||
| }, | |||
| } | |||
| } | |||
| import orderMixin from '@/mixins/order.js' | |||
| export default { | |||
| mixins: [orderMixin], | |||
| components: { | |||
| }, | |||
| computed: { | |||
| }, | |||
| data() { | |||
| return { | |||
| tabs: [ | |||
| { | |||
| name: '全部' | |||
| }, | |||
| { | |||
| name: '待付款' | |||
| }, | |||
| { | |||
| name: '配送中' | |||
| }, | |||
| { | |||
| name: '已完成' | |||
| }, | |||
| { | |||
| name: '已取消' | |||
| } | |||
| ], | |||
| queryParams: { | |||
| pageNo: 1, | |||
| pageSize: 10 | |||
| }, | |||
| orderList: { | |||
| records: [], | |||
| total: 0, | |||
| }, | |||
| state: -1, | |||
| } | |||
| }, | |||
| onShow() { | |||
| this.getData() | |||
| }, | |||
| //滚动到屏幕底部 | |||
| onReachBottom() { | |||
| if (this.queryParams.pageSize < this.orderList.total) { | |||
| this.queryParams.pageSize += 10 | |||
| this.getData() | |||
| } | |||
| }, | |||
| methods: { | |||
| getData() { | |||
| let queryParams = { | |||
| ...this.queryParams, | |||
| } | |||
| if (this.state != -1) { | |||
| queryParams.state = this.state | |||
| } | |||
| this.$api('getOrderPageBean', queryParams, res => { | |||
| if (res.code == 200) { | |||
| this.orderList = res.result | |||
| } | |||
| }) | |||
| }, | |||
| //点击tab栏 | |||
| clickTabs({ index }) { | |||
| if (index == 0) { | |||
| this.state = -1; | |||
| } else { | |||
| this.state = index - 1; | |||
| } | |||
| this.queryParams.pageSize = 10 | |||
| this.getData() | |||
| }, | |||
| //跳转订单详情页面 | |||
| toOrderDetail(id) { | |||
| uni.navigateTo({ | |||
| url: '/pages_order/order/orderDetail?id=' + id | |||
| }) | |||
| }, | |||
| getOrderList() { | |||
| }, | |||
| } | |||
| } | |||
| </script> | |||
| <style scoped lang="scss"> | |||
| .page{ | |||
| } | |||
| .list { | |||
| .item { | |||
| width: calc(100% - 40rpx); | |||
| background-color: #fff; | |||
| margin: 20rpx; | |||
| box-sizing: border-box; | |||
| border-radius: 16rpx; | |||
| padding: 30rpx; | |||
| .top { | |||
| display: flex; | |||
| justify-content: space-between; | |||
| align-items: center; | |||
| font-size: 30rpx; | |||
| .service {} | |||
| .status { | |||
| font-size: 26rpx; | |||
| font-weight: 600; | |||
| } | |||
| } | |||
| .content { | |||
| display: flex; | |||
| margin: 10rpx 0; | |||
| .left { | |||
| width: 150rpx; | |||
| height: 150rpx; | |||
| border-radius: 10rpx; | |||
| image { | |||
| width: 150rpx; | |||
| height: 150rpx; | |||
| border-radius: 10rpx; | |||
| } | |||
| } | |||
| .right { | |||
| width: calc(100% - 160rpx); | |||
| color: #777; | |||
| font-size: 24rpx; | |||
| padding-left: 20rpx; | |||
| line-height: 40rpx; | |||
| background-color: #F8F8F8; | |||
| } | |||
| } | |||
| .bottom { | |||
| display: flex; | |||
| justify-content: space-between; | |||
| font-size: 25rpx; | |||
| .price { | |||
| color: #787777; | |||
| font-weight: 900; | |||
| text { | |||
| color: #fd7d41; | |||
| font-size: 30rpx; | |||
| } | |||
| } | |||
| .b1 { | |||
| border: 1px solid #777; | |||
| color: #777; | |||
| box-sizing: border-box; | |||
| } | |||
| .b2 { | |||
| background: linear-gradient(178deg, #4FD3BC, #60C285); | |||
| color: #fff; | |||
| } | |||
| view { | |||
| margin: 12rpx; | |||
| border-radius: 28rpx; | |||
| padding: 8rpx 28rpx; | |||
| margin-bottom: 0; | |||
| } | |||
| } | |||
| } | |||
| } | |||
| .page {} | |||
| .list { | |||
| .item { | |||
| width: calc(100% - 40rpx); | |||
| background-color: #fff; | |||
| margin: 20rpx; | |||
| box-sizing: border-box; | |||
| border-radius: 16rpx; | |||
| padding: 30rpx; | |||
| .top { | |||
| display: flex; | |||
| justify-content: space-between; | |||
| align-items: center; | |||
| font-size: 30rpx; | |||
| .service {} | |||
| .status { | |||
| font-size: 26rpx; | |||
| font-weight: 600; | |||
| color: $uni-color; | |||
| } | |||
| } | |||
| .content { | |||
| display: flex; | |||
| margin: 10rpx 0; | |||
| .left { | |||
| width: 150rpx; | |||
| height: 150rpx; | |||
| border-radius: 10rpx; | |||
| image { | |||
| width: 150rpx; | |||
| height: 150rpx; | |||
| border-radius: 10rpx; | |||
| } | |||
| } | |||
| .right { | |||
| width: calc(100% - 160rpx); | |||
| color: #777; | |||
| font-size: 24rpx; | |||
| padding-left: 20rpx; | |||
| line-height: 40rpx; | |||
| background-color: #F8F8F8; | |||
| } | |||
| } | |||
| .bottom { | |||
| display: flex; | |||
| justify-content: space-between; | |||
| font-size: 25rpx; | |||
| .price { | |||
| color: #787777; | |||
| font-weight: 900; | |||
| text { | |||
| color: #fd7d41; | |||
| font-size: 26rpx; | |||
| } | |||
| } | |||
| .b1 { | |||
| border: 1px solid #777; | |||
| color: #777; | |||
| box-sizing: border-box; | |||
| } | |||
| .b2 { | |||
| background: linear-gradient(178deg, $uni-color, #d34f4f); | |||
| color: #fff; | |||
| } | |||
| view { | |||
| margin: 12rpx; | |||
| border-radius: 28rpx; | |||
| padding: 8rpx 28rpx; | |||
| margin-bottom: 0; | |||
| } | |||
| } | |||
| } | |||
| } | |||
| </style> | |||
+ 5
- 5
pages_order/auth/wxUserInfo.vue
View File
+ 0
- 1
pages_order/components/address/addressList.vue
View File
+ 10
- 6
pages_order/components/address/redactAddress.vue
View File
+ 227
- 0
pages_order/components/address/redactAddressForm.vue
View File
| @ -0,0 +1,227 @@ | |||
| <template> | |||
| <view class="redact-address"> | |||
| <uv-form label-width="210rpx" :model="addressDetail" ref="form"> | |||
| <uv-form-item label="联系人" prop="name"> | |||
| <uv-input v-model="addressDetail.name" placeholder="请输入联系人姓名" border="none"> | |||
| </uv-input> | |||
| </uv-form-item> | |||
| <uv-form-item label="手机号" prop="phone"> | |||
| <uv-input v-model="addressDetail.phone" placeholder="请输入手机号" border="none"> | |||
| </uv-input> | |||
| </uv-form-item> | |||
| <uv-form-item label="所在地区" prop="address"> | |||
| <uv-input v-model="addressDetail.address" placeholder="请选择所在地区" border="none"> | |||
| </uv-input> | |||
| <template #right> | |||
| <view style="padding-right: 40rpx;color: #FBAB32;" @click.stop="selectAddr"> | |||
| <image src="../../static/address/selectIcon.png" mode="aspectFit"></image>定位 | |||
| </view> | |||
| </template> | |||
| </uv-form-item> | |||
| <uv-form-item label="详细地址" prop="addressDetail"> | |||
| <uv-input v-model="addressDetail.addressDetails" placeholder="请输入详细地址" border="none"> | |||
| </uv-input> | |||
| </uv-form-item> | |||
| </uv-form> | |||
| </view> | |||
| </template> | |||
| <script> | |||
| import Position from '@/utils/position.js' | |||
| export default { | |||
| data() { | |||
| return { | |||
| addressDetail: { | |||
| name: '', | |||
| phone: '', | |||
| address: '', | |||
| addressDetails: '', | |||
| defaultFlag: '', | |||
| latitude: '', | |||
| longitude: '' | |||
| } | |||
| } | |||
| }, | |||
| props: { | |||
| title: { | |||
| type: String, | |||
| default: '新增地址' | |||
| } | |||
| }, | |||
| methods: { | |||
| open(addressDetail) { | |||
| this.addressDetail = addressDetail | |||
| this.$refs.addressPopup.open('bottom') | |||
| }, | |||
| close(){ | |||
| this.$refs.addressPopup.close() | |||
| }, | |||
| //新增和修改地址 | |||
| onSubmit() { | |||
| let isOk = this.parameterVerification(this.addressDetail) | |||
| if (isOk && !isOk.auth) { | |||
| return uni.showToast({ | |||
| icon: 'none', | |||
| title: isOk.title, | |||
| 'zIndex': 10000 | |||
| }) | |||
| } | |||
| this.$emit('saveOrUpdate', this.addressDetail) | |||
| }, | |||
| //验证用户参数合法性 | |||
| parameterVerification(addressForm) { | |||
| let { | |||
| name, | |||
| phone, | |||
| address, | |||
| addressDetails | |||
| } = addressForm | |||
| if (name.trim() == '') { | |||
| return { | |||
| title: '请填写联系人', | |||
| auth: false | |||
| } | |||
| } else if (phone.trim() == '') { | |||
| return { | |||
| title: '请填写手机号', | |||
| auth: false | |||
| } | |||
| } else if (address.trim() == '') { | |||
| return { | |||
| title: '请填写所在地区', | |||
| auth: false | |||
| } | |||
| } else if (addressDetails.trim() == '') { | |||
| return { | |||
| title: '请填写详细地址', | |||
| auth: false | |||
| } | |||
| } else if (phone.trim() != '') { | |||
| if (!this.$utils.verificationPhone(phone)) { | |||
| return { | |||
| title: '手机号格式不合法', | |||
| auth: false | |||
| } | |||
| } | |||
| } | |||
| return { | |||
| title: '验证通过', | |||
| auth: true | |||
| } | |||
| }, | |||
| //地图上选择地址 | |||
| selectAddr() { | |||
| // Position.getLocation(res => { | |||
| Position.selectAddress(0, 0, success => { | |||
| this.setAddress(success) | |||
| }) | |||
| // }) | |||
| }, | |||
| //提取用户选择的地址信息复制给表单数据 | |||
| setAddress(res) { | |||
| //经纬度信息 | |||
| this.addressDetail.latitude = res.latitude | |||
| this.addressDetail.longitude = res.longitude | |||
| if (!res.address && res.name) { //用户直接选择城市的逻辑 | |||
| return this.addressDetail.address = res.name | |||
| } | |||
| if (res.address || res.name) { | |||
| return this.addressDetail.address = res.address + res.name | |||
| } | |||
| this.addressDetail.address = '' //用户啥都没选就点击勾选 | |||
| }, | |||
| } | |||
| } | |||
| </script> | |||
| <style lang="scss" scoped> | |||
| .redact-address { | |||
| box-sizing: border-box; | |||
| .redact-address-title { | |||
| height: 80rpx; | |||
| line-height: 80rpx; | |||
| font-size: 30rpx; | |||
| color: #333333; | |||
| font-weight: 600; | |||
| } | |||
| .save { | |||
| display: flex; | |||
| align-items: center; | |||
| justify-content: center; | |||
| width: 90%; | |||
| height: 80rpx; | |||
| border-radius: 40rpx; | |||
| color: white; | |||
| font-size: 28rpx; | |||
| margin: 0rpx auto; | |||
| background: $uni-color; | |||
| margin-top: 150rpx; | |||
| } | |||
| image { | |||
| width: 25rpx; | |||
| height: 25rpx; | |||
| } | |||
| //修改组件默认样式 | |||
| .uv-form { | |||
| padding: 30rpx 0rpx; | |||
| } | |||
| .uv-input__content__field-wrapper__field{ | |||
| padding: 30rpx !important; | |||
| height: 180rpx !important; | |||
| } | |||
| &::v-deep .uv-cell { | |||
| padding: 0rpx 0rpx; | |||
| font-size: 26rpx; | |||
| &::after { | |||
| border: none !important; | |||
| } | |||
| .uv-field__label { | |||
| display: flex; | |||
| align-items: center; | |||
| height: 80rpx; | |||
| } | |||
| .uv-field__control, | |||
| .uv-field__right-icon { | |||
| height: 80rpx; | |||
| font-size: 26rpx; | |||
| border-bottom: 2rpx solid #cbc8c8; | |||
| } | |||
| .uv-field__right-icon { | |||
| display: flex; | |||
| align-items: center; | |||
| height: 78rpx; | |||
| color: #5FCC9F; | |||
| } | |||
| .uv-cell__value { | |||
| height: 120rpx; | |||
| } | |||
| } | |||
| &::v-deep .uv-field__error-message { | |||
| color: #5AC796; | |||
| font-size: 20rpx; | |||
| margin-top: 10rpx; | |||
| } | |||
| } | |||
| </style> | |||
+ 36
- 0
pages_order/mine/about.vue
View File
| @ -0,0 +1,36 @@ | |||
| <template> | |||
| <view class="page"> | |||
| <navbar | |||
| title="关于本程序" | |||
| leftClick | |||
| @leftClick="$utils.navigateBack" | |||
| /> | |||
| <view class="content"> | |||
| <uv-parse :content="configList.config_aboutus"></uv-parse> | |||
| </view> | |||
| </view> | |||
| </template> | |||
| <script> | |||
| export default { | |||
| data() { | |||
| return { | |||
| } | |||
| }, | |||
| methods: { | |||
| } | |||
| } | |||
| </script> | |||
| <style scoped lang="scss"> | |||
| .page{ | |||
| .content{ | |||
| padding: 20rpx; | |||
| background-color: #fff; | |||
| } | |||
| } | |||
| </style> | |||
+ 3
- 2
pages_order/mine/address.vue
View File
+ 33
- 9
pages_order/mine/individualTeam.vue
View File
+ 7
- 1
pages_order/mine/purse.vue
View File
+ 203
- 173
pages_order/mine/runningWater.vue
View File
+ 6
- 6
pages_order/order/createOrder.vue
View File
+ 444
- 2
pages_order/order/firmOrder.vue
View File
+ 518
- 507
pages_order/order/orderDetail.vue
File diff suppressed because it is too large
View File
+ 12
- 10
pages_order/order/voiceOrder.vue
View File
BIN
pages_order/static/address/icon.png
View File
| Before | After |
|---|---|
|
|
| Width: 96 | Height: 96 | Size: 4.5 KiB | Width: 96 | Height: 96 | Size: 4.5 KiB |
BIN
static/image/center/10.png
View File
| Before | After |
|---|---|
|
|
| Width: 355 | Height: 158 | Size: 45 KiB | Width: 720 | Height: 320 | Size: 113 KiB |
BIN
static/image/center/headImage.png
View File
| Before | After |
|---|---|
|
|
| Width: 116 | Height: 116 | Size: 16 KiB |