hly
/
Jingde-town-wechat-uniapp
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

上传

master
前端-胡立永 6 months ago
parent
8f7d341dac
commit
0dd6091112
17 changed files with 193 additions and 108 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +13
    -0
      api/api.js
  2. +14
    -10
      components/list/videoList.vue
  3. +7
    -7
      components/tourGuide/locations.vue
  4. +1
    -1
      config.js
  5. +4
    -1
      pages.json
  6. +4
    -10
      pages_order/auth/loginAndRegisterAndForgetPassword.vue
  7. +8
    -1
      pages_order/components/product/submit.vue
  8. +9
    -2
      pages_order/components/submit/StudyAndPathDetailSubmit.vue
  9. +1
    -1
      pages_order/order/order.vue
  10. +35
    -53
      pages_order/order/orderDetail.vue
  11. +3
    -3
      pages_order/order/orderSubscribe.vue
  12. +10
    -3
      pages_order/product/productDetail.vue
  13. +10
    -4
      pages_order/service/StudyAndPathDetail.vue
  14. +12
    -4
      pages_order/service/articleDetail.vue
  15. +48
    -4
      pages_order/service/carefree.vue
  16. +13
    -3
      pages_order/service/reservationDetail.vue
  17. +1
    -1
      pages_order/service/tellList.vue

+ 13
- 0
api/api.js View File

@ -115,6 +115,12 @@ const config = {
method: 'GET',
showLoading: true,
},
// 获取地点详情
querySpotById: {
url: '/info/querySpotById',
method: 'GET',
showLoading: true,
},
// 获取视频列表
queryVedioById: {
url: '/info/queryVedioById',
@ -315,6 +321,13 @@ const config = {
showLoading: true,
limit : 500,
},
// 查询文创好物订单详情
queryWaresOrderById: {
url: '/info/queryWaresOrderById',
method: 'GET',
showLoading: true,
limit : 500,
},
// 搜索文章
queryArticleListByTitle: {
url: '/info/queryArticleListByTitle',


+ 14
- 10
components/list/videoList.vue View File

@ -7,7 +7,7 @@
<view class="video-item" v-for="(item, index) in list" :key="index"
>
<view class="image" @click="showVideo(item, index)">
<image :src="item.videoImage" mode="aspectFill">
<image :src="item.travelVideo.videoImage" mode="aspectFill">
</image>
<view class="icon">
<uv-icon size="35rpx" name="play-right-fill">
@ -18,13 +18,13 @@
<view class="headImage">
<!-- <image src="https://img-s-msn-com.akamaized.net/tenant/amp/entityid/BB1msKSi.img" mode="aspectFill">
</image> -->
{{ item.videoTitle }}
{{ item.travelVideo.videoTitle }}
</view>
<view class="like"
@click="addThumpup(item.id)">
<uv-icon size="45rpx" v-if="false" name="heart"></uv-icon>
<uv-icon size="45rpx" color="#FF4340" v-else name="heart-fill"></uv-icon>
{{ item.videoThumpup }}
@click="addThumpup(item.travelVideo.id)">
<uv-icon size="45rpx" color="#FF4340" v-if="item.thumpupFlag" name="heart-fill"></uv-icon>
<uv-icon size="45rpx" v-else name="heart"></uv-icon>
{{ item.travelVideo.videoThumpup }}
</view>
</view>
</view>
@ -64,7 +64,7 @@ import index from '../../uni_modules/uv-ui-tools'
this.list.forEach(n => {
sources.push({
url : n.videoContent,
url : n.travelVideo.videoContent,
type : 'video'
})
})
@ -81,15 +81,19 @@ import index from '../../uni_modules/uv-ui-tools'
this.queryParams.roleInfoId = this.roleId
}
if(uni.getStorageSync('token')){
this.queryParams.token = uni.getStorageSync('token')
}
this.$api('queryVedioById', this.queryParams, res => {
if(res.code == 200){
this.list = res.result.records
this.total = res.result.total
this.list = res.result
// this.total = res.result.total
}
})
},
loadMoreData(){
if(this.queryParams.pageSize < this.total){
if(this.queryParams.pageSize <= this.list.length){
this.queryParams.pageSize += 10
this.queryVideoList()
}


+ 7
- 7
components/tourGuide/locations.vue View File

@ -125,7 +125,7 @@
</template>
<script>
// var plugin = requirePlugin("WechatSI")
var plugin = requirePlugin("WechatSI")
// "plugins" : {
// "WechatSI" : {
@ -145,8 +145,8 @@
context : uni.createInnerAudioContext(),
tabs : ['文化遗产',
// '路径定制',
'找厕所'
, '找美食', '找民宿'],
'找美食'
, '找民宿', '找厕所'],
}
},
computed : {
@ -163,10 +163,10 @@
let self = this
self.context.src = this.$config.baseUrl + '/info/textToAudio?text=' + "你好"
self.context.play()
// self.context.src = this.$config.baseUrl + '/info/textToAudio?text=' + "你好"
// self.context.play()
return
// return
plugin.textToSpeech({
lang: "zh_CN",
@ -202,7 +202,7 @@
},
toUrl(item){
if(item.categoryId == 0){
// this.$utils.navigateTo(`/pages_order/service/articleDetail?id=${item.id}&type=Inheritance`)
this.$utils.navigateTo(`/pages_order/service/articleDetail?id=${item.id}&type=Inheritance`)
}
},
}


+ 1
- 1
config.js View File

@ -45,7 +45,7 @@ const defaultConfig = {
},
Inheritance : {//遗产概况
title : '文化遗产',
api : 'queryArticleById',
api : 'querySpotById',
},
tell : {//遗产讲述
title : '遗产讲述',


+ 4
- 1
pages.json View File

@ -28,7 +28,10 @@
"subPackages": [{
"root": "pages_order",
"pages": [{
"path": "order/orderDetail"
"path": "order/orderDetail",
"style": {
"enablePullDownRefresh" : true
}
},
{
"path": "mine/purse"


+ 4
- 10
pages_order/auth/loginAndRegisterAndForgetPassword.vue View File

@ -6,7 +6,7 @@
<!-- 登录和注册 -->
<view class="loginRegister" v-if='titleIndex!=2'>
<!-- 标题 -->
<view class="title">{{title}}</view>
<view class="title">{{titleList[titleIndex]}}</view>
<!-- 头像 -->
<view class="userIamge">
@ -41,7 +41,7 @@
<!-- 按钮 -->
<view class="btn">
<button class='a'>{{btnText}}</button>
<button class='a'>{{titleList[titleIndex]}}</button>
</view>
<!-- tab -->
@ -61,7 +61,7 @@
<!-- 忘记密码 -->
<view class='forgetPassword' v-if='titleIndex==2'>
<!-- 标题 -->
<view class="title">{{title}}</view>
<view class="title">{{titleList[titleIndex]}}</view>
<!-- 表单 -->
<view class="form1">
@ -96,7 +96,7 @@
<!-- 按钮 -->
<view class="btn">
<button class='a'>{{btnText}}</button>
<button class='a'>{{titleList[titleIndex]}}</button>
</view>
<!-- tab -->
@ -126,8 +126,6 @@
},
onLoad(option) {
this.titleIndex = option.index
this.title = option.index == 0 ? '注册' : option.index == 1 ? '登录' : '忘记密码'
this.btnText = option.index == 0 ? '注册' : option.index == 1 ? '登录' : '重置密码'
},
data() {
return {
@ -156,8 +154,6 @@
borderRadius: '100rpx',
bottom: '42%'
},
title: "", //标题
btnText: "", //按钮文字,
tips: '获取验证码',
seconds: 60,
}
@ -167,8 +163,6 @@
// 切换页面
changePage(index) {
this.titleIndex = index
this.title = index == 0 ? '注册' : index == 1 ? '登录' : '忘记密码'
this.btnText = index == 0 ? '注册' : index == 1 ? '登录' : '重置密码'
},
confirm() {


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

@ -16,9 +16,14 @@
@click="$emit('collect')">
<button
class="share">
<uv-icon size="40rpx" color="#FF4340"
v-if="collectonFlag"
name="star-fill"></uv-icon>
<uv-icon
name="star"
v-else
size="40rpx"
name="star"></uv-icon>
></uv-icon>
<view class="">
收藏
</view>
@ -53,6 +58,8 @@
},
detail : {
default : {}
},
collectonFlag : {
}
},
data() {


+ 9
- 2
pages_order/components/submit/StudyAndPathDetailSubmit.vue View File

@ -20,9 +20,14 @@
@click="addCollection">
<button
class="share">
<uv-icon
<uv-icon size="40rpx" color="#FF4340"
v-if="collectonFlag"
name="star-fill"></uv-icon>
<uv-icon
name="star"
v-else
size="40rpx"
name="star"></uv-icon>
></uv-icon>
<!-- star-fill -->
<view class="">
收藏
@ -92,6 +97,8 @@
},
isPay : {
default : true,
},
collectonFlag : {
}
},
data() {


+ 1
- 1
pages_order/order/order.vue View File

@ -27,7 +27,7 @@
<view v-if="orderList.length > 0" class="list">
<view class="item"
v-for="(item, index) in orderList"
@click="toOrderDetail(item.id)"
@click="toOrderDetail(item.travelWaresOrder.id)"
:key="index">
<view class="top">


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

@ -7,7 +7,7 @@
/>
<!-- 水洗店 -->
<view class=""
<!-- <view class=""
v-if="userShop">
<view class="controls">
<view class="title">
@ -35,7 +35,7 @@
v-for="(item, index) in steps"></uv-steps-item>
</uv-steps>
</view>
</view>
</view> -->
<!-- 酒店和水洗店 -->
<view class="info">
@ -43,30 +43,30 @@
style="display: flex;">
<view style="width: 8rpx;height: 30rpx;
background: #FD5100;border-radius: 6rpx;" />
<view class="head-title">服务项目</view>
<view class="head-title">文创好物</view>
</view>
<view class="flex">
<view class="server-item">
<view class="img-box">
<image :src="msgShop.image" mode="aspectFill"></image>
<image :src="msgShop.waresImage" mode="aspectFill"></image>
</view>
<view class="server-info">
<view class="server-title">
{{msgOrder.projectName}}
{{msgShop.waresTitle}}
<!-- <view class="coupon">领券立减</view> -->
</view>
<view class="current-price">
<text class="unit">￥</text>{{msgOrder.money}}
<text class="unit">￥</text>{{msgOrder.price}}
</view>
<view class="sales-volume" style="margin-top: 5px;">
<!-- <view class="sales-volume" style="margin-top: 5px;">
<view class="desc">规格：{{msgOrder.unit}}</view>
</view>
</view> -->
<view class="time-coupon">
@ -120,12 +120,12 @@
服务地址
</view> -->
<view class="copy">
<image @click="copy(msgOrder.name + ' ' + msgOrder.phone + ' ' + msgOrder.address)" src="/static/order/copy.png"></image>
<image @click="copy(msgOrder.userName + ' ' + msgOrder.userPhone + ' ' + msgOrder.userAddress)" 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="">{{msgOrder.userName}} {{msgOrder.userPhone}}</view>
<view class="">{{msgOrder.userAddress}}</view>
</view>
</view>
@ -136,30 +136,6 @@
实付款
</view>
<view class="current-price">
￥{{ msgOrder.money }}
</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>
</view>
<view class="min_tips">
<view class="">
押金
</view>
<view class="">
￥{{ msgOrder.price }}
</view>
</view>
@ -227,27 +203,33 @@
'开始清洗',
'服务完成',
],
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 : {},
msgOrder : {},
id : 0,
}
},
onLoad({id}) {
this.id = id
},
onPullDownRefresh() {
this.getData()
},
onShow() {
this.getData()
},
methods: {
getData(){
this.$api('queryWaresOrderById', {
waresOrderId : this.id
}, res => {
uni.stopPullDownRefresh()
if(res.code == 200){
this.msgShop = res.result.travelWares
this.msgOrder = res.result.travelWaresOrder
}
})
},
clickService(){},
}
}
</script>


+ 3
- 3
pages_order/order/orderSubscribe.vue View File

@ -188,11 +188,11 @@
detailTitle(){
return this.detail.roleName ||
this.detail.amusementTitle ||
this.detail.experienceTitle
this.detail.experienceTitle || ''
},
price(){
return this.detail.price ||
this.detail.amusementPrice
this.detail.amusementPrice || 0
}
},
onLoad(args) {
@ -216,7 +216,7 @@
}, res => {
uni.stopPullDownRefresh()
if(res.code == 200){
this.detail = res.result
this.detail = res.result.travelRoleInfo || res.result.travelExperience || res.result.travelAmusement
}
})
},


+ 10
- 3
pages_order/product/productDetail.vue View File

@ -57,6 +57,7 @@
<!-- 分享和租赁按钮 -->
<submit
:detail="productDetail"
:collectonFlag="collectonFlag"
@collect="addCollection"
@submit="$refs.submitUnitSelect.open()" @share="share" />
@ -77,6 +78,7 @@
return {
productDetail: {},
productId : 0,
collectonFlag : false,
}
},
onLoad(args) {
@ -104,13 +106,18 @@
},
getData() {
this.$api('queryWaresById', {
let data = {
waresId: this.productId
},
}
if(uni.getStorageSync('token')){
data.token = uni.getStorageSync('token')
}
this.$api('queryWaresById', data,
res => {
uni.stopPullDownRefresh()
if (res.code == 200) {
this.productDetail = res.result
this.productDetail = res.result.travelWares
this.collectonFlag = res.result.collectonFlag
}
})
},


+ 10
- 4
pages_order/service/StudyAndPathDetail.vue View File

@ -49,6 +49,7 @@
@getData="getData"
@submit="toPayUrl(detail, type)"
:isPay="detail.isPay == '1'"
:collectonFlag="collectonFlag"
:collectType="dict.collectType"/>
</view>
</template>
@ -78,6 +79,7 @@
contentKey : ['amusementRoute', 'amusementAttention', 'amusementStatement'],
content : '',
dict : {},
collectonFlag : false,
}
},
onLoad(args) {
@ -104,13 +106,17 @@
this.content = this.detail[this.contentKey[index]]
},
getData(){
this.$api('queryAmusementById',
{
let data = {
amusementId : this.id,
}, res => {
}
if(uni.getStorageSync('token')){
data.token = uni.getStorageSync('token')
}
this.$api('queryAmusementById', data, res => {
uni.stopPullDownRefresh()
if(res.code == 200){
this.detail = res.result
this.detail = res.result.travelAmusement
this.collectonFlag = res.result.collectonFlag
this.content = this.detail[this.contentKey[0]]
}
})


+ 12
- 4
pages_order/service/articleDetail.vue View File

@ -2,7 +2,7 @@
<!-- 0文化遗产详情、1申遗历程详情、2非遗体验详情 三合一 -->
<view class="page">
<navbar :title="dict.title" leftClick @leftClick="$utils.navigateBack" />
<uv-parse :content="detail.articleContent || detail.experienceDetail"></uv-parse>
<uv-parse :content="detail.articleContent || detail.experienceDetail || detail.spotDetail"></uv-parse>
<StudyAndPathDetailSubmit
@ -12,6 +12,7 @@
:detail="detail"
@getData="queryArticleById"
@submit="toPayUrl(detail, type)"
:collectonFlag="collectonFlag"
:collectType="dict.collectType"
/>
</view>
@ -29,6 +30,7 @@
id : 0,
type : '',
dict : {},
collectonFlag : false,
}
},
onLoad(args) {
@ -44,13 +46,19 @@
},
methods: {
queryArticleById(){
this.$api(this.dict.api, {
let data = {
articleId : this.id,
experienceId : this.id,
}, res => {
spotId : this.id,
}
if(uni.getStorageSync('token')){
data.token = uni.getStorageSync('token')
}
this.$api(this.dict.api, data, res => {
uni.stopPullDownRefresh()
if(res.code == 200){
this.detail = res.result
this.detail = res.result.travelExperience || res.result
this.collectonFlag = res.result.collectonFlag
}
})
},


+ 48
- 4
pages_order/service/carefree.vue View File

@ -16,19 +16,19 @@
无忧服务
</view>
<view class="list">
<view class="button1">
<view class="button1" @click="toM">
<image src="../static/service/carefree/1.png" mode=""></image>
<view class="">
瓷都美食
</view>
</view>
<view class="button2">
<view class="button2" @click="toMS">
<image src="../static/service/carefree/2.png" mode=""></image>
<view class="">
精品民宿
</view>
</view>
<view class="button3">
<view class="button3" @click="toDD">
<image src="../static/service/carefree/3.png" mode=""></image>
<view class="">
无忧租车
@ -60,7 +60,51 @@
...mapState(['banner']),
},
methods: {
// 跳转美团民宿
toMS(){
uni.navigateToMiniProgram({
appId: 'wxc147016e2b3bf9d6',
// path: '',
envVersion: "release",
success: res => {
// 打开成功
console.log("打开成功", res);
},
fail: err => {
console.log(err);
}
})
},
// 跳转美团美食
toM(){
uni.navigateToMiniProgram({
appId: 'wxde8ac0a21135c07d',
// path: '',
envVersion: "release",
success: res => {
// 打开成功
console.log("打开成功", res);
},
fail: err => {
console.log(err);
}
})
},
// 跳转DD打车
toDD(){
uni.navigateToMiniProgram({
appId: 'wxaf35009675aa0b2a',
// path: '',
envVersion: "release",
success: res => {
// 打开成功
console.log("打开成功", res);
},
fail: err => {
console.log(err);
}
})
},
}
}
</script>


+ 13
- 3
pages_order/service/reservationDetail.vue View File

@ -16,8 +16,12 @@
@click="addCollection">
<button
class="share">
<uv-icon size="50rpx" color="#FF4340"
v-if="collectonFlag"
name="star-fill"></uv-icon>
<uv-icon
name="star"
v-else
size="50rpx"
></uv-icon>
收藏
@ -138,6 +142,7 @@
id : 0,
dict : {},
detail : {},
collectonFlag : false,
}
},
onLoad(args) {
@ -184,12 +189,17 @@
})
},
getData(){
this.$api('queryRoleInfoById', {
let data = {
roleInfoId : this.id,
}, res => {
}
if(uni.getStorageSync('token')){
data.token = uni.getStorageSync('token')
}
this.$api('queryRoleInfoById', data, res => {
uni.stopPullDownRefresh()
if(res.code == 200){
this.detail = res.result
this.detail = res.result.travelRoleInfo
this.collectonFlag = res.result.collectonFlag
}
})
},


+ 1
- 1
pages_order/service/tellList.vue View File

@ -128,7 +128,7 @@
.map(n => {
return {
label : n.spotName,
value : n.id
value : n.spotName
}
})


Write Preview
Loading…
Cancel
Save