hly
/
universal-wechat-uniapp-241007
generated from hly/uniapp-shop-templates
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

上传

master
前端-胡立永 4 months ago
parent
2b3fc12da1
commit
5a8e1114ef
25 changed files with 667 additions and 459 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +16
    -0
      api/api.js
  2. +2
    -2
      api/model/order.js
  3. +4
    -22
      components/list/activity/activityItem.vue
  4. +3
    -52
      components/list/dynamic/dynamicItem.vue
  5. +1
    -0
      components/list/dynamic/dynamicItemEdit.vue
  6. +4
    -9
      components/list/dynamic/userHeadItem.vue
  7. +70
    -0
      components/list/statisticalDataInfo.vue
  8. +10
    -3
      components/user/createDetailPopup.vue
  9. +67
    -58
      components/user/sharePopup.vue
  10. +93
    -0
      components/user/signInOnePopup.vue
  11. +47
    -23
      pages/index/index.vue
  12. +4
    -21
      pages_order/activity/activityDetail.vue
  13. +7
    -7
      pages_order/car/carList.vue
  14. +70
    -58
      pages_order/components/list/cart/cartItem.vue
  15. +2
    -1
      pages_order/components/list/renting/rentingItem.vue
  16. +24
    -16
      pages_order/components/list/workList/workItem.vue
  17. +46
    -8
      pages_order/components/product/submit.vue
  18. +47
    -45
      pages_order/components/product/submitUnitSelect.vue
  19. +56
    -3
      pages_order/components/screen/screenSearch.vue
  20. +20
    -17
      pages_order/order/order.vue
  21. +53
    -85
      pages_order/order/orderDetail.vue
  22. +5
    -23
      pages_order/post/postDetail.vue
  23. +4
    -4
      pages_order/product/productDetail.vue
  24. +2
    -1
      pages_order/work/workDetail.vue
  25. +10
    -1
      store/store.js

+ 16
- 0
api/api.js View File

@ -305,6 +305,22 @@ const config = {
showLoading : true,
},
// 获取今日是否签到
getTodaySign : {
url: '/token/getTodaySign',
method: 'GET',
auth : true,
showLoading : true,
},
// 获取今日是否签到
sign : {
url: '/token/sign',
method: 'POST',
auth : true,
showLoading : true,
},
}
const models = ['order']


+ 2
- 2
api/model/order.js View File

@ -25,14 +25,14 @@ const api = {
// 商城-订单列表
getOrderList : {
url: '/order/getOrderList',
method: 'POST',
method: 'GET',
auth : true,
},
// 商城-订单详情
getOrderDetail : {
url: '/order/getOrderDetail',
method: 'POST',
method: 'GET',
auth : true,
},
}


+ 4
- 22
components/list/activity/activityItem.vue View File

@ -7,28 +7,8 @@
<daynamicInfo :item="item"/>
<view class="bottom">
<view class="browse">
{{ item.isBrowse }}浏览
</view>
<view class="browse">
{{ item.isComment }}条评论
</view>
<view class="browse">
点赞
</view>
<view class="browse">
<view class="icon">
<uv-icon name="attach"></uv-icon>
</view>
分享
</view>
<callPhone
style="margin-left: auto;"
:phone="item.phone"
:sexName="item.sex"/>
</view>
<statisticalDataInfo :item="item"/>
</view>
</template>
@ -37,12 +17,14 @@
import userHeadItem from '@/components/list/dynamic/userHeadItem.vue'
import daynamicInfo from '@/components/list/dynamic/daynamicInfo.vue'
import activityInfo from '@/components/list/activity/activityInfo.vue'
import statisticalDataInfo from '@/components/list/statisticalDataInfo.vue'
export default {
mixins: [mixinsSex],
components : {
userHeadItem,
daynamicInfo,
activityInfo,
statisticalDataInfo,
},
props: {
item: {},


+ 3
- 52
components/list/dynamic/dynamicItem.vue View File

@ -5,50 +5,19 @@
<daynamicInfo :item="item" />
<view class="bottom">
<!-- 浏览 -->
<view class="browse">
{{ item.isBrowse }}
<view class="bontt">
<uv-icon name="eye-fill"></uv-icon>
</view>
</view>
<!-- 评论 -->
<view class="browse">
{{ item.isComment }}
<view class="bontt">
<uv-icon name="chat-fill"></uv-icon>
</view>
</view>
<view class="browse">
22
<view class="bontt">
<uv-icon name="thumb-up-fill"></uv-icon>
</view>
<!-- 点赞 -->
</view>
<view class="browse">
0
<view class="bontt">
<uv-icon name="attach"></uv-icon>
</view>
</view>
<callPhone :phone="item.phone" :sexName="item.sex" />
</view>
<statisticalDataInfo :item="item"/>
</view>
</template>
<script>
import userHeadItem from '@/components/list/dynamic/userHeadItem.vue'
import daynamicInfo from '@/components/list/dynamic/daynamicInfo.vue'
import statisticalDataInfo from '@/components/list/statisticalDataInfo.vue'
export default {
components: {
userHeadItem,
daynamicInfo,
statisticalDataInfo,
},
props: {
item: {},
@ -67,23 +36,5 @@
padding: 40rpx;
border-radius: 20rpx;
box-shadow: 0 0 6rpx 6rpx #00000011;
.bottom {
display: flex;
margin-top: 20rpx;
font-size: 24rpx;
.browse {
display: flex;
justify-content: center;
align-items: center;
margin: 0rpx 30rpx;
color: rgb(132, 132, 132);
margin-left: 10rpx;
}
.bontt{
margin: 0rpx 5rpx;
}
}
}
</style>

+ 1
- 0
components/list/dynamic/dynamicItemEdit.vue View File

@ -2,6 +2,7 @@
<view class="works" @click="$emit('click')">
<userHeadItem :item="item"/>
<daynamicInfo :item="item"/>
<view class="bottom">


+ 4
- 9
components/list/dynamic/userHeadItem.vue View File

@ -1,16 +1,13 @@
<template>
<view class="o">
<view class="indee">
<view class="k">
<view class="k"
v-if="item.classId_dictText">
#{{item.classId_dictText}}
</view>
</view>
<view class="box" :style="{'--sexcolor' : sex[item.sex].color}">
<!-- <view class="indee">
#{{item.classId_dictText}}
</view> -->
<view class="headPortraitimg">
<image :src="item.userImage" @click.stop="previewImage([item.userImage])" mode="aspectFill"></image>
</view>
@ -50,8 +47,8 @@
{{ item.createTime }}发布
</view>
<!-- <view class="Month">
12:34
</view> -->
12:34
</view> -->
</view>
</view>
@ -93,8 +90,6 @@
display: flex;
align-items: center;
.indee {}
.headPortraitimg {
width: 100rpx;


+ 70
- 0
components/list/statisticalDataInfo.vue View File

@ -0,0 +1,70 @@
<template>
<view class="bottom">
<!-- 浏览 -->
<view class="browse">
{{ item.isBrowse }}
<view class="bontt">
<uv-icon name="eye-fill"></uv-icon>
</view>
</view>
<!-- 评论 -->
<view class="browse">
{{ item.isComment }}
<view class="bontt">
<uv-icon name="chat-fill"></uv-icon>
</view>
</view>
<!-- 点赞 -->
<view class="browse">
{{ item.isUp || 0 }}
<view class="bontt">
<uv-icon name="thumb-up-fill"></uv-icon>
</view>
</view>
<!-- 分享 -->
<view class="browse">
{{ item.isDown || 0 }}
<view class="bontt">
<uv-icon name="attach"></uv-icon>
</view>
</view>
<callPhone :phone="item.phone" :sexName="item.sex" />
</view>
</template>
<script>
export default {
data() {
return {
}
},
props: {
item: {},
},
methods: {
}
}
</script>
<style scoped lang="scss">
.bottom {
display: flex;
margin-top: 20rpx;
font-size: 24rpx;
.browse {
display: flex;
justify-content: center;
align-items: center;
margin: 0rpx 30rpx;
color: rgb(132, 132, 132);
margin-left: 10rpx;
}
.bontt {
margin: 0rpx 5rpx;
}
}
</style>

+ 10
- 3
components/user/createDetailPopup.vue View File

@ -1,20 +1,24 @@
<template>
<view>
<view class="createDetail">
<!-- 添加内容 -->
<view @click="open">
<uv-icon size="40rpx" color="#fff" name="plus"></uv-icon>
</view>
<!-- 悬浮图标 -->
<!-- 联系我们 -->
<view>
<button @click="$utils.navigateTo('/pages_order/mine/promotion')">
<button @click="$emit('customerServiceOpen')">
<uv-icon size="40rpx"
color="#fff"
name="server-man"></uv-icon>
</button>
</view>
<!-- 积分规则 -->
<view>
<button>
<button @clickan class="s">="$emit('integralDetailsOpen')">
<uv-icon size="40rpx"
color="#fff"
name="question-circle"></uv-icon>
@ -41,11 +45,14 @@
</view>
</view>
</uv-popup>
</view>
</template>
<script>
export default {
components : {
},
data() {
return {
createDetail: [],


+ 67
- 58
components/user/sharePopup.vue View File

@ -1,35 +1,50 @@
<template>
<uv-popup ref="popup" :round="30">
<view class="page">
<view class="UniversalWall">
<view class="look">
<view class="logo">
<image src="/static/image/logo.jpg" mode="aspectFill"></image>
</view>
<view class="wall">
瑶都万能墙
</view>
<view class="invite">
<button open-type="share">
<uv-icon name="attach"></uv-icon>
邀请好友
</button>
</view>
<view class="logo">
<image src="/static/image/logo.jpg" mode="aspectFill"></image>
</view>
<view class="wall">
瑶都万能墙
</view>
<view class="invite">
<button open-type="share">
<uv-icon name="attach"></uv-icon>
邀请好友
</button>
</view>
</view>
<view class="vip">
<view class="title">
{{ headInfo.vip.keyName }}
</view>
<uv-parse :content="headInfo.vip.keyDetails"></uv-parse>
<view class="uni-color-btn"
@click="submit">
开通￥{{ headInfo.vip.keyValue }}
</view>
</view>
</view>
</uv-popup>
</template>
<script>
import { mapState } from 'vuex'
export default {
data() {
return {}
},
computed : {
...mapState(['headInfo']),
},
methods: {
open() {
this.$refs.popup.open('bottom')
@ -40,60 +55,54 @@
<style scoped lang="scss">
.page {
height: 250rpx;
border-radius: 15rpx;
padding: 20rpx;
.vip{
.uni-color-btn{
width: 80%;
}
}
.UniversalWall {
height: 100%;
width: 100%;
background-color: rgb(247,247,249);
border-radius: 15rpx;
.look {
display: flex;
.wall {
font-size: 30rpx;
letter-spacing: 2px;
color: black;
margin: 70rpx 0rpx;
}
display: flex;
justify-content: center;
align-items: center;
.invite {
margin-top: 45rpx;
margin-left: auto;
margin-right: 10rpx;
button{
background-color: white;
font-size: 30rpx;
display: flex;
width: 200rpx;
justify-content: center;
align-items: center;
border-radius: 20rpx !important;
padding: 0 !important;
margin: 0 !important;
}
.wall {
font-size: 30rpx;
letter-spacing: 2px;
color: black;
}
.invite {
margin-left: auto;
button {
background-color: white;
font-size: 30rpx;
display: flex;
width: 200rpx;
justify-content: center;
align-items: center;
border-radius: 20rpx !important;
padding: 0 !important;
margin: 0 !important;
}
.logo {
width: 120rpx;
height: 120rpx;
margin: 30rpx;
image {
width: 100%;
height: 100%;
border-radius: 15rpx;
}
}
.logo {
width: 120rpx;
height: 120rpx;
margin: 20rpx;
image {
width: 100%;
height: 100%;
border-radius: 15rpx;
}
}
}
.title {}
}
</style>

+ 93
- 0
components/user/signInOnePopup.vue View File

@ -0,0 +1,93 @@
<template>
<view class="configPopup">
<uv-popup ref="popup" :round="30" :customStyle="{height: '50vh'}">
<view class="content">
<view class="title">今日签到获取积分</view>
<view class="un">{{ headInfo.integral }}</view>
<view class="uni-color-btn"
@click="submit">
签到
</view>
</view>
</uv-popup>
</view>
</template>
<script>
import { mapState } from 'vuex'
export default {
data() {
return {
}
},
computed : {
...mapState(['headInfo']),
},
mounted() {
if(uni.getStorageSync('token')){
this.getTodaySign()
}
},
methods: {
submit(){
this.$api('sign', res => {
if(res.code == 200){
uni.showToast({
title: '签到成功',
icon: 'none'
})
this.$refs.popup.close()
}
})
},
getTodaySign(){
this.$api('getTodaySign', res => {
if(res.result){
this.$refs.popup.open()
}
})
},
}
}
</script>
<style scoped lang="scss">
.configPopup {
.content{
padding: 30rpx 20rpx;
text-align: center;
overflow: scroll;
height: 100%;
width: 640rpx;
box-sizing: border-box;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.title{
font-size: 30rpx;
font-weight: 900;
}
.un{
background-color: $uni-color;
color: #fff;
width: 200rpx;
height: 200rpx;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
font-size: 50rpx;
font-weight: 900;
margin-top: 50rpx;
}
.uni-color-btn{
width: 80%;
margin-top: 180rpx;
}
}
}
</style>

+ 47
- 23
pages/index/index.vue View File

@ -21,39 +21,38 @@
</view>
<view class="top">
<view class="profilePicture"
@click="$refs.customerServicePopup.open()">
<image :src="headinfo.headImage" mode=""></image>
>
<image :src="headInfo.headImage" mode=""></image>
</view>
<view class="UniversalWall">
<view class="dynamic"
@click="$refs.customerServicePopup.open()">
{{ headinfo.name }}
<view class="dynamic">
{{ headInfo.name }}
</view>
<!-- <view class="dynamics">
{{headinfo.num}}动态
{{headInfo.num}}动态
<text>|</text>
<view
@click="$utils.navigateTo('/pages_order/mine/allUser')"
>
{{headinfo.userNum}}江华人
{{headInfo.userNum}}江华人
</view>
</view>
<view class="dynamics">
{{headinfo.homeNum}}租房
{{headInfo.homeNum}}租房
<text>|</text>
{{headinfo.jobNum}}工作
{{headInfo.jobNum}}工作
<text>|</text>
{{headinfo.jdNum}}景点
{{headInfo.jdNum}}景点
<text>|</text>
{{headinfo.shopNum}}美食
{{headInfo.shopNum}}美食
<text>|</text>
{{headinfo.activityNum}}活动
{{headInfo.activityNum}}活动
</view> -->
<view class="dynamics">
江华便民生活好帮手
@ -114,8 +113,7 @@
<!-- 动态列表 -->
<view
class="dynamicList"
:style="{backgroundColor: queryParams.classId ? '' : 'wheat'}">
class="dynamicList">
<dynamicItem
:key="index"
v-for="(item, index) in list"
@ -125,16 +123,39 @@
</view>
</view>
<createDetailPopup/>
<!-- 页面浮窗 -->
<createDetailPopup
@customerServiceOpen="$refs.customerServicePopup.open()"
@integralDetailsOpen="$refs.integralDetailsPopup.open('bottom')"
/>
<!-- 加入我们 -->
<certificationPopup ref="certificationPopup"/>
<!-- 分享 -->
<sharePopup ref="sharePopup"/>
<!-- 签到获取积分 -->
<signInOnePopup ref="signInOnePopup"/>
<!-- 联系客服 -->
<customerServicePopup
:title="headinfo.details"
:image="headinfo.kefu"
:title="headInfo.details"
:image="headInfo.kefu"
ref="customerServicePopup"/>
<!-- 隐私协议 -->
<PrivacyAgreementPoup />
<!-- 积分规则 -->
<uv-popup ref="integralDetailsPopup"
:round="30"
:customStyle="{height: '60vh'}">
<view style="overflow: scroll;padding: 30rpx 20rpx;">
<uv-parse :content="headInfo.integralDetails"></uv-parse>
</view>
</uv-popup>
<tabber select="0" />
</view>
</template>
@ -146,6 +167,7 @@
import createDetailPopup from '@/components/user/createDetailPopup.vue'
import customerServicePopup from '@/components/user/customerServicePopup.vue'
import sharePopup from '@/components/user/sharePopup.vue'
import signInOnePopup from '@/components/user/signInOnePopup.vue'
import dynamicItem from '@/components/list/dynamic/dynamicItem.vue'
import mixinsList from '@/mixins/list.js'
import { mapState } from 'vuex'
@ -159,10 +181,11 @@
dynamicItem,
certificationPopup,
sharePopup,
signInOnePopup,
},
data() {
return {
headinfo: {},
// headInfo: {},
menu : [],
mixinsListApi : 'getPostPage',
bannerList : [],
@ -175,14 +198,15 @@
}
this.getData()
this.getIndexHeaderInfo()
// this.getIndexHeaderInfo()
this.$store.commit('getIndexHeaderInfo')
this.getClassifyList()
this.getBannerList()
this.$store.commit('getCategory')
},
onShareAppMessage(res) {
return {
title: this.headinfo.name,
title: this.headInfo.name,
path: '/pages/index/index'
}
},
@ -190,14 +214,14 @@
this.getUserInfo()
},
onPullDownRefresh() {
this.getIndexHeaderInfo()
// this.getIndexHeaderInfo()
this.getClassifyList()
this.getBannerList()
this.$store.commit('getCategory')
this.getUserInfo()
},
computed: {
...mapState(['city', 'category', 'userInfo']),
...mapState(['city', 'category', 'userInfo', 'headInfo']),
},
methods: {
tabsClick(item) {
@ -224,7 +248,7 @@
getIndexHeaderInfo(){
this.$api('getIndexHeaderInfo',res =>{
if(res.code == 200){
this.headinfo = res.result
this.headInfo = res.result
}
})
},


+ 4
- 21
pages_order/activity/activityDetail.vue View File

@ -11,27 +11,8 @@
<daynamicInfo :item="detail"/>
<view class="bottom">
<view class="browse">
{{ detail.isBrowse }}浏览
</view>
<view class="browse">
{{ detail.isComment }}条评论
</view>
<!-- <view class="Leavingamessage"
@click="openLocation(detail.latitude, detail.longitude)"
v-if="detail.latitude && detail.longitude">
<uv-icon size="40rpx" name="map"></uv-icon>
导航
</view> -->
<callPhone
style="margin-left: auto;"
:phone="detail.phone"
:sexName="detail.sex"/>
</view>
<statisticalDataInfo :item="detail"/>
</view>
@ -52,6 +33,7 @@
import userHeadItem from '@/components/list/dynamic/userHeadItem.vue'
import daynamicInfo from '@/components/list/dynamic/daynamicInfo.vue'
import activityInfo from '@/components/list/activity/activityInfo.vue'
import statisticalDataInfo from '@/components/list/statisticalDataInfo.vue'
export default {
mixins: [mixinsSex, mixinsList],
components: {
@ -59,6 +41,7 @@
userHeadItem,
daynamicInfo,
activityInfo,
statisticalDataInfo,
},
data() {
return {


+ 7
- 7
pages_order/car/carList.vue View File

@ -9,7 +9,7 @@
placeholder="请输入搜索关键字..." v-model="queryParams.title"></uv-search>
</view>
<view class="LabelOptions">
<!-- <view class="LabelOptions">
<uv-tabs :list="tabs"
:activeStyle="{color : '#fff', fontWeight : 900}"
:inactiveStyle="{color : '#eee'}"
@ -18,12 +18,12 @@
lineWidth="50rpx"
:scrollable="false"
@click="tabsClick"></uv-tabs>
</view>
<!-- <view class="">
<screenRen :isArea="false" @clickItem="clickItem" />
</view> -->
<view class="">
<screenSearch @clickItem="clickItem" />
</view>
<view class="list">
<cartItem :key="index" v-for="(item, index) in list" :item="item"
@click="$utils.navigateTo('/pages_order/car/carListDetail?id=' + item.id)" />
@ -35,13 +35,13 @@
<script>
import mixinsList from '@/mixins/list.js'
import screenRen from '../components/screen/screenRen.vue'
import screenSearch from '../components/screen/screenSearch.vue'
import cartItem from '../components/list/cart/cartItem.vue'
export default {
mixins: [mixinsList],
components: {
cartItem,
screenRen,
screenSearch,
},
data() {
return {


+ 70
- 58
pages_order/components/list/cart/cartItem.vue View File

@ -30,7 +30,7 @@
<view class="zhaoche">
<view class="touxinag">
<image :src="item.imageTitle" mode="aspectFill"></image>
</view>
<view class="chezhaoren">
<uv-icon name="car-fill" color="#2979ff" size="50"></uv-icon>
@ -39,49 +39,48 @@
<view class="lianxi">
<uv-icon name="phone-fill" color="#fff" size="40"></uv-icon>
联系
</view>
</view>
<view class="address">
<view class="shi">
始
</view>
<view class="zhi">
<view class="address">
<view class="shi">
始
</view>
<view class="zhi">
{{item.startAddress}}
</view>
</view>
<view class="ads">
<view class="zhon">
终
</view>
<view class="zhi">
{{item.endAddress}}
</view>
</view>
</view>
<view class="time">
出发时间：{{item.startTime}}
</view>
<view class="chexing">
车型：suv
</view>
<view class="chezhuxinxi">
<view class="sex">
<uv-icon name="man" color="#2979ff" size="28"></uv-icon>
<view class="ads">
<view class="zhon">
终
</view>
<view class="zhi">
{{item.endAddress}}
</view>
</view>
<view class="name">
{{item.createBy}}
<view class="time">
出发时间：{{item.startTime}}
</view>
<!-- <view class="chexing">
车型：suv
</view> -->
<!-- <view class="chezhuxinxi">
<view class="sex">
<uv-icon name="man" color="#2979ff" size="28"></uv-icon>
</view>
<view class="name">
{{item.createBy}}
</view>
</view> -->
</view>
</view>
</template>
<script>
@ -106,8 +105,7 @@
<style lang="scss" scoped>
.item {
height: 330rpx;
width: 100%;
padding: 15rpx;
background-color: #fff;
overflow: hidden;
border-radius: 10rpx;
@ -122,24 +120,28 @@
margin: 20rpx 10rpx;
display: flex;
justify-content: space-between;
.touxinag {
height: 70rpx;
width: 70rpx;
background-color: black;
image{
width: 100%;
height: 100%;
}
}
.chezhaoren {
display: flex;
justify-content: center;
align-items: center;
margin-right: 230rpx;
margin-right: auto;
margin-left: 10rpx;
border: 1rpx solid $uni-color;
height: 40rpx;
padding: 16rpx;
color:$uni-color ;
color: $uni-color;
border-radius: 10rpx;
}
.lianxi {
@ -153,14 +155,16 @@
border-radius: 15rpx;
margin: 0rpx 20rpx;
}
}
.address{
.address {
display: flex;
margin: 0rpx 10rpx;
.shi{
.shi {
margin-right: 10rpx;
background-color:$uni-color ;
background-color: $uni-color;
color: white;
width: 30rpx;
height: 30rpx;
@ -168,17 +172,20 @@
border-radius: 50%;
text-align: center;
}
.zhi{
.zhi {
margin-top: 5rpx;
}
}
.ads{
.ads {
display: flex;
margin: 10rpx 10rpx;
.zhon{
.zhon {
margin-right: 10rpx;
background-color:red;
background-color: red;
color: white;
width: 30rpx;
height: 30rpx;
@ -187,19 +194,24 @@
text-align: center;
}
}
.time{
margin: 10rpx 10rpx;
.time {
margin: 10rpx 10rpx;
}
.chexing{
.chexing {
margin: 10rpx 10rpx;
}
.chezhuxinxi{
.chezhuxinxi {
display: flex;
margin: 10rpx 10rpx;
.sex{
.sex {
margin-top: 5rpx;
}
.name{
.name {
margin-left: 8rpx;
}
}


+ 2
- 1
pages_order/components/list/renting/rentingItem.vue View File

@ -1,7 +1,7 @@
<template>
<view class="item"
@click="$emit('click', item)">
<image :src="images[0]" mode="aspectFill"></image>
<image class="image" :src="images[0]" mode="aspectFill"></image>
<view class="info">
<view class="title">
@ -67,6 +67,7 @@
height: 180rpx;
border-radius: 20rpx;
margin-right: 20rpx;
flex-shrink: 0;
}
.info{
gap: 10rpx;


+ 24
- 16
pages_order/components/list/workList/workItem.vue View File

@ -10,17 +10,17 @@
<view class="index">
<view class="Salary">
<text v-if="item.minPrice">{{item.minPrice}}</text>
-
<text v-if="item.maxPrice">{{item.maxPrice}}元</text>
<!-- - -->
<!-- <text v-if="item.maxPrice">{{item.maxPrice}}元</text> -->
</view>
<view class="gang"
<!-- <view class="gang"
v-if="item.school">
|
</view>
<view class="Cashregister"
</view> -->
<!-- <view class="Cashregister"
v-if="item.school">
{{item.school}}
</view>
</view> -->
<view class="gang"
v-if="item.workYear">
|
@ -29,18 +29,26 @@
v-if="item.workYear">
{{item.workYear}}
</view>
<view class="gang"
v-if="item.city">
|
</view>
<view class="Cashregister"
v-if="item.city">
{{ item.city }}
</view>
<template
v-for="(t, i) in item.iconText && item.iconText.split(',')">
<view class="gang">
|
</view>
<view class="Cashregister">
{{t}}
</view>
</template>
</view>
<addressSpot
:address="item.address"
:latitude="item.latitude"
:longitude="item.longitude"
/>
<view class="address">
<view class="shop">
{{ item.address }}
{{ item.company }}
</view>
<view class="authentication"
v-if="item.isCardOpen">
@ -111,7 +119,7 @@
.index {
display: flex;
flex-wrap: wrap;
.Salary {
color: red;
}


+ 46
- 8
pages_order/components/product/submit.vue View File

@ -1,18 +1,15 @@
<template>
<view class="submit">
<view class=""
<view class="icon"
@click="$emit('share')">
<button open-type="share"
class="share">
<uv-icon
size="40rpx"
name="share-square"></uv-icon>
<view class="">
分享
</view>
</button>
</view>
<!-- <view class=""
<!-- <view class="icon"
@click="$utils.navigateTo('/index/cart')">
<button
class="share">
@ -24,10 +21,22 @@
</view>
</button>
</view> -->
<view class="btn"
<!-- <view class="btn"
@click="$emit('submit')">
{{ submiitTitle }}
</view> -->
<view class="submit-btn"
@click="$emit('submit')">
<view class="l">
立即兑换
</view>
<view class="r">
立即购买
</view>
</view>
</view>
</template>
@ -52,13 +61,41 @@
</script>
<style lang="scss" scoped>
.submit-btn{
width: 600rpx;
height: 80rpx;
color: #fff;
border-radius: 40rpx;
font-size: 28rpx;
margin: 20rpx auto;
display: flex;
justify-content: center;
align-items: center;
border: 1rpx solid $uni-price-color;
overflow: hidden;
.l{
flex: 1;
display: flex;
justify-content: center;
align-items: center;
color: $uni-price-color;
}
.r{
background: $uni-price-color;
flex: 1;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
}
}
.submit{
position: fixed;
bottom: 0;
left: 0;
width: 100vw;
background-color: #fff;
height: 100rpx;
height: 120rpx;
display: flex;
justify-content: center;
align-items: center;
@ -71,7 +108,8 @@
border-radius: 40rpx;
font-size: 28rpx;
}
view{
.icon{
width: 100rpx;
margin: 0 10rpx;
display: flex;


+ 47
- 45
pages_order/components/product/submitUnitSelect.vue View File

@ -83,13 +83,13 @@
<!-- 提交按钮 -->
<view class="submit-btn">
<!-- <view class="l"
@click="addCart">
加入租赁车
</view> -->
<view class="l"
@click="exchange">
立即兑换
</view>
<view class="r"
@click="orderPay">
{{ submiitTitle }}
立即购买
</view>
</view>
@ -113,7 +113,7 @@
},
props : {
submiitTitle : {
default : '立即兑换',
default : '立即购买',
type : String,
},
detail : {
@ -172,16 +172,26 @@
this.unit = item
this.unitIndex = index
},
addCart(){
this.$api('cartAdd', {
id : this.detail.id,
skuId : this.unit.id,
}, res => {
// 积分兑换
exchange(){
let data = {
shopId : this.detail.id,//商品id
addressId : this.address.id,//地址id
num : this.num,
}
if(this.$utils.verificationAll(data, {
addressId : '请选择地址',
})){
return
}
this.$api('createPointsOrder', data, res => {
if(res.code == 200){
uni.showToast({
title: '添加成功',
});
this.$refs.popup.close()
uni.redirectTo({
url: '/pages_order/order/order'
})
}
})
},
@ -203,37 +213,29 @@
return
}
this.$api('createPointsOrder', data, res => {
// this.$api('order_createPointsOrder', data, res => {
this.$api('createOrder', data, res => {
if(res.code == 200){
uni.redirectTo({
url: '/pages/index/order'
})
// uni.requestPayment({
// provider: 'wxpay', // 服务提提供商
// timeStamp: res.result.timeStamp, // 时间戳
// nonceStr: res.result.nonceStr, // 随机字符串
// package: res.result.packageValue,
// signType: res.result.signType, // 签名算法
// paySign: res.result.paySign, // 签名
// success: function (res) {
// console.log('支付成功',res);
// uni.redirectTo({
// url: '/pages/index/order'
// })
// },
// fail: function (err) {
// console.log('支付失败',err);
// uni.showToast({
// icon:'none',
// title:"支付失败"
// })
// }
// });
uni.requestPayment({
provider: 'wxpay', // 服务提提供商
timeStamp: res.result.timeStamp, // 时间戳
nonceStr: res.result.nonceStr, // 随机字符串
package: res.result.packageValue,
signType: res.result.signType, // 签名算法
paySign: res.result.paySign, // 签名
success: function (res) {
console.log('支付成功',res);
uni.redirectTo({
url: '/pages_order/order/order'
})
},
fail: function (err) {
console.log('支付失败',err);
uni.showToast({
icon:'none',
title:"支付失败"
})
}
});
}
})
},


+ 56
- 3
pages_order/components/screen/screenSearch.vue View File

@ -19,14 +19,25 @@
:value="dropItem('area').value">
</uv-drop-down-item>
<!-- 价格 -->
<!-- v-if="isMaxPrice" -->
<uv-drop-down-item
v-if="isMaxPrice"
name="maxPrice" type="2"
:label="dropItem('maxPrice').label"
:value="dropItem('maxPrice').value">
</uv-drop-down-item>
<uv-drop-down-item
name="reviewSort" type="2"
:label="dropItem('reviewSort').label"
:value="dropItem('reviewSort').value">
</uv-drop-down-item>
<uv-drop-down-item
name="retransmissionSort" type="2"
:label="dropItem('retransmissionSort').label"
:value="dropItem('retransmissionSort').value">
</uv-drop-down-item>
</uv-drop-down>
@ -55,7 +66,7 @@
data() {
return {
// 表示value等于这些值，就属于默认值
defaultValue: [0, 'all', 'all'],
defaultValue: [0, 'all', 'all', 'all'],
// 筛选结果
result: [],
activeName: 'area',
@ -73,7 +84,7 @@
]
},
maxPrice: {
label: '最高价',
label: '价格',
value: 'all',
activeIndex: 0,
color: '#333',
@ -117,6 +128,48 @@
},
]
},
reviewSort : {
label: '评论',
value: 'all',
activeIndex: 0,
color: '#333',
activeColor: '#3796F8',
child: [
{
label: '默认',
value: 'all'
},
{
label: '评论最多',
value: 'desc'
},
{
label: '评论最少',
value: 'asc'
},
]
},
retransmissionSort : {
label: '转发',
value: 'all',
activeIndex: 0,
color: '#333',
activeColor: '#3796F8',
child: [
{
label: '默认',
value: 'all'
},
{
label: '转发最多',
value: 'desc'
},
{
label: '转发最少',
value: 'asc'
},
]
},
list : [
// {
// title : '您目前所属的年龄段',


+ 20
- 17
pages_order/order/order.vue View File

@ -23,10 +23,10 @@
<view class="top">
<view class="service">
<text>{{item.projectId_dictText}}</text>
<text>{{item.type_dictText}}</text>
<text>{{ item.projectId_dictText }}</text>
</view>
<view class="status">
<text> {{item.state_dictText}}</text>
<text> {{ tabs[item.state + 1].name }}</text>
</view>
</view>
@ -38,29 +38,34 @@
<view class="right">
<view class="text-hidden-1">
客户姓名：{{item.name}}
客户姓名：{{ item.addressName }}
</view>
<view class="text-hidden-1">
产品规格：{{item.unit}}
商品名称：{{ item.name }}
</view>
<view class="text-hidden-1">
租赁地址：{{item.address}}
收货地址：{{ item.addressCity + item.addressDetails }}
</view>
<view class="text-hidden-1">
购买数量：{{ item.num }}
</view>
<!-- <view class="text-hidden-1">
总计时间：{{item.useTime}}分钟
</view> -->
</view>
</view>
<view class="bottom">
<view class="price">
总价格：<text class="num">{{item.money}}元</text>
<view class="price"
v-if="item.type == 1">
价格：<text class="num">{{ item.price }}元</text>
</view>
<view class="b1">
查看物流
<view class="price"
v-if="item.type == 0">
积分：<text class="num">{{ item.points }}元</text>
</view>
<!-- <view class="b1">
查看物流
</view> -->
<!-- <view @click.stop="toPayOrder(item)" class="b2" v-if="item.state == 0">
立即付款
</view>
@ -94,7 +99,8 @@
data() {
return {
mixinsListApi: 'getOrderList',
tabs: [{
tabs: [
{
name: '全部'
},
{
@ -122,7 +128,7 @@
this.state = index - 1;
}
this.queryParams.pageSize = 10
this.orderPage()
this.getData()
},
//跳转订单详情页面
toOrderDetail(id) {
@ -130,9 +136,6 @@
url: '/pages_order/order/orderDetail?id=' + id
})
},
getOrderList(){
},
}
}
</script>


+ 53
- 85
pages_order/order/orderDetail.vue View File

@ -8,7 +8,7 @@
<!-- 水洗店 -->
<view class="">
<view class="controls">
<!-- <view class="controls">
<view class="title">
<image src="../static/order/icon.png" mode=""></image>
服务完成
@ -24,7 +24,7 @@
线下配送
</view>
</view>
</view>
</view> -->
<view class="steps">
<uv-steps
activeColor="#FD5100"
@ -49,29 +49,29 @@
<view class="server-item">
<view class="img-box">
<image :src="msgShop.image" mode="aspectFill"></image>
<image :src="order.image" mode="aspectFill"></image>
</view>
<view class="server-info">
<view class="server-title">
{{msgOrder.projectName}}
{{order.name}}
<!-- <view class="coupon">领券立减</view> -->
</view>
<view class="current-price">
<text class="unit">￥</text>{{msgOrder.money}}
价格<text class="unit">￥</text>{{order.price}}
</view>
<view class="sales-volume" style="margin-top: 5px;">
<view class="desc">规格：{{msgOrder.unit}}</view>
<view class="current-price">
积分{{order.points}}
</view>
<view class="time-coupon">
<!-- <view class="flex">
<image src="@/static/home/time-icon.png"></image>
<view class="time">{{msgOrder.useTime}}分钟</view>
<view class="time">{{order.useTime}}分钟</view>
</view> -->
<!-- <view class="sales-volume">
@ -86,45 +86,19 @@
</view>
</view>
<!-- <view class="line min_tips">
<view class="head-div flex">
<view style="width: 118rpx;height: 118rpx;border-radius: 50%;overflow: hidden;">
<image style="width: 118rpx;" :src="msgTechnician.image" mode="widthFix"></image>
</view>
<view style="padding: 10rpx 34rpx;display: flex;flex-direction: column;justify-content: space-around;">
<view class="nickname">
{{msgTechnician.title}}
<view v-if="msgTechnician.isVip" class="tag">
<image src="@/static/order/s.png" mode="aspectFit"></image>
<view class="auth">官方认证</view>
</view>
</view>
<view class="days">
<van-rate v-model="msgTechnician.score" :size="10" readonly color="#ffb54c" void-icon="star"
void-color="#eee" />
<view class="">
好评{{msgTechnician.pinNum}}
</view>
</view>
</view>
</view>
<view @click="gototechnicianDetail(msgTechnician)" class="btn-x">
服务技师
</view>
</view> -->
<view class="line address">
<view class="address-top">
<!-- <view class="">
服务地址
</view> -->
<view class="">
收货地址
</view>
<view class="copy">
<image @click="copy(msgOrder.name + ' ' + msgOrder.phone + ' ' + msgOrder.address)" src="/static/order/copy.png"></image>
<image @click="$utils.copyText(order.addressName + item.addressDetails + ' ' + order.addressPhone + ' ' + order.addressCity)" src="/static/order/copy.png"></image>
</view>
</view>
<view class="addressDetail">
<view class="">{{msgOrder.name}} {{msgOrder.phone}}</view>
<view class="">{{msgOrder.address}}</view>
<view class="">{{order.addressName}} {{order.addressPhone}}</view>
<view class="">{{order.addressCity + item.addressDetails}}</view>
</view>
</view>
@ -134,32 +108,21 @@
<view class="">
实付款
</view>
<view class="current-price">
￥{{ msgOrder.money }}
<view class="current-price"
v-if="order.type == 0">
{{ order.points }}积分
</view>
</view>
<view class="min_tips">
<view class="">
租赁费用
</view>
<view class="">
￥{{ msgOrder.price }}
</view>
</view>
<view class="min_tips">
<view class="">
水洗费用
</view>
<view class="">
￥{{ msgOrder.price}}
<view class="current-price"
v-if="order.type == 1">
￥{{ order.price }}元
</view>
</view>
<view class="min_tips">
<view class="">
押金
支付方式
</view>
<view class="">
￥{{ msgOrder.price }}
￥{{ ['积分兑换', '微信支付'][order.type] }}
</view>
</view>
</view>
@ -176,7 +139,7 @@
订单编号
</view>
<view class="">
{{msgOrder.id}}
{{order.id}}
</view>
</view>
<view class="min_tips">
@ -184,7 +147,7 @@
下单时间
</view>
<view class="">
{{msgOrder.createTime}}
{{order.createTime}}
</view>
</view>
</view>
@ -219,28 +182,30 @@
return {
stepsCurrent : 0,
steps : [
'接单',
'检查',
'开始清洗',
'服务完成',
'待支付',
'待发货',
'待收货',
'已完成',
],
msgShop : {
money : 99.99,
image : 'https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg',
projectExplain : '1.xxxxxxxxxx xxxxxxxxxx。2.xxxxxx xxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxx xxxxxxxxxxxxxxxx。3.。',
},
msgOrder : {
money : 99.99,
address : '广东省广州市越秀区城南故事C3栋2802',
name : '李**',
phone : '150*****091',
unit : '120*40*75【桌子尺寸】',
state_dictText : '已完成',
price : 199.99,
id : '020644568964457',
createTime : '2024-01-18 15:39',
projectName : '桌布租赁'
},
// msgShop : {
// money : 99.99,
// image : 'https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg',
// projectExplain : '1.xxxxxxxxxx xxxxxxxxxx。2.xxxxxx xxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxx xxxxxxxxxxxxxxxx。3.。',
// },
// order : {
// money : 99.99,
// address : '广东省广州市越秀区城南故事C3栋2802',
// name : '李**',
// phone : '150*****091',
// unit : '120*40*75【桌子尺寸】',
// state_dictText : '已完成',
// price : 199.99,
// id : '020644568964457',
// createTime : '2024-01-18 15:39',
// projectName : '桌布租赁'
// },
order : {},
id : 0,
}
},
@ -253,9 +218,12 @@
methods: {
getDetail(){
this.$api('getOrderDetail', {
id : this.id
orderId : this.id
}, res => {
if(res.code == 200){
this.order = res.result
this.stepsCurrent= res.result.state
}
})
},
}


+ 5
- 23
pages_order/post/postDetail.vue View File

@ -8,35 +8,15 @@
<daynamicInfo :item="detail"/>
<view class="bottom">
<view class="browse">
{{ detail.isBrowse }}浏览
</view>
<view class="browse">
{{ detail.isComment }}条评论
</view>
<!-- <view class="Leavingamessage"
@click="openLocation(detail.latitude, detail.longitude)"
v-if="detail.latitude && detail.longitude">
<uv-icon size="40rpx" name="map"></uv-icon>
导航
</view> -->
<callPhone
style="margin-left: auto;"
:phone="item.phone"
:sexName="item.sex"/>
</view>
<statisticalDataInfo :item="detail"/>
</view>
<commentList
@getData="getData"
:list="list"
:params="params"
/>
</view>
</template>
@ -47,12 +27,14 @@
import commentList from '../components/list/comment/commentList.vue'
import userHeadItem from '@/components/list/dynamic/userHeadItem.vue'
import daynamicInfo from '@/components/list/dynamic/daynamicInfo.vue'
import statisticalDataInfo from '@/components/list/statisticalDataInfo.vue'
export default {
mixins: [mixinsSex, mixinsList],
components: {
commentList,
userHeadItem,
daynamicInfo,
statisticalDataInfo,
},
data() {
return {


+ 4
- 4
pages_order/product/productDetail.vue View File

@ -37,7 +37,7 @@
{{ detail.points }}
</view>
</view>
<view class="tips">
<!-- <view class="tips">
<view class="tip">
专业设备
</view>
@ -47,16 +47,16 @@
<view class="tip">
质量保证
</view>
</view>
</view> -->
</view>
<view class="info-unit">
<!-- <view class="info-unit">
<uv-cell>
<template #icon>
<text>上门取件·送货上门</text>
</template>
</uv-cell>
</view>
</view> -->
<view class="content">
<view class="title">


+ 2
- 1
pages_order/work/workDetail.vue View File

@ -8,7 +8,8 @@
</view>
<view class="price">
{{ detail.minPrice }}-{{ detail.maxPrice }}元
{{ detail.minPrice }}
<!-- <text>-{{ detail.maxPrice }}元</text> -->
</view>
<view class="line">


+ 10
- 1
store/store.js View File

@ -8,12 +8,13 @@ import api from '@/api/api.js'
//Vuex.Store 构造器选项
const store = new Vuex.Store({
state: {
configList: [], //配置列表
configList: {}, //配置列表
shop : false,
userInfo : {}, //用户信息
city : {},//当前城市
cityList : [],//城市列表
category : [],//动态分类
headInfo : [],//首页配置
},
getters: {
// 角色 true为水洗店 false为酒店
@ -126,6 +127,14 @@ const store = new Vuex.Store({
}
})
},
// 获取小程序首页配置
getIndexHeaderInfo(state){
api('getIndexHeaderInfo', res =>{
if(res.code == 200){
state.headInfo = res.result
}
})
},
},
actions: {},
})


Write Preview
Loading…
Cancel
Save