liangxin/xdd-uniapp-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into test

Browse Source
This commit is contained in:
lifizer
2024-03-28 11:39:47 +08:00
parent 75bec54a76 cfd09436f1
commit ce68fd6870
27 changed files with 949 additions and 3504 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/css/base.less
+5
View File
@@ -291,3 +291,8 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked {
.ai-center {
align-items: center;
}
.ql-editor.ql-blank::before {
font-style: normal;
font-size: 28rpx;
color: #C2C5CC;
}
assets/css/style.less
+1
View File
@@ -2463,6 +2463,7 @@ page {
}
.user .wrapper .myOrder .orderState .item .pictrue {
position: relative;
width: 52rpx;
height: 52rpx;
margin: 0 auto 0.18*100rpx auto;
config/index.js
+2 -10
View File
@@ -1,11 +1,3 @@
// export const VUE_APP_API_URL = "https://shop.xdd618.com/api";
// export const VUE_APP_API_URL = "https://www.xdd618.com/api";
// export const SERVICE_API_URL = "https://service-test.xdd618.com/api";
// export const SERVICE_API_URL = "https://service.xdd618.com/api";
// export const SOCKET_URL = "wss://service-test.xdd618.com/ws";
// export const SOCKET_URL = "wss://service.xdd618.com/ws";
const NODE_ENV = process.env.VUE_APP_ENV || 'development'
let BASE_URL = ''
let SERVICE_URL = ''
@@ -16,7 +8,7 @@ if (NODE_ENV === 'development' || NODE_ENV === 'test') {
SERVICE_WS_URL = 'wss://service-test.xdd618.com/ws'
}
if (NODE_ENV === 'prod') {
BASE_URL = 'https://www.xdd618.com/api'
BASE_URL = 'https://wxapp.xdd618.com/api'
SERVICE_URL = 'https://service.xdd618.com/api'
SERVICE_WS_URL = 'wss://service.xdd618.com/ws'
}
@@ -26,7 +18,7 @@ export const SERVICE_API_URL = SERVICE_URL
export const SOCKET_URL = SERVICE_WS_URL
export const VUE_APP_RESOURCES_URL = "https://www.xdd618.com/api/file/pic";
export const VUE_APP_RESOURCES_URL = "https://wxapp.xdd618.com/api/file/pic"
export const STATIC_RESOURCE_URL = "https://resource.xdd618.com/image"
export const WX_LIVE_APPID = "wx2b03c6e691cd7370";
pages.json
+1 -9
View File
@@ -856,14 +856,6 @@
"navigationBarTitleText": "文玩"
}
},
{
"path": "views/store",
"style": {
"navigationBarTitleText": "文玩店铺详情",
"navigationStyle": "custom",
"navigationBarTextStyle": "white"
}
},
{
"path": "views/storeList",
"style": {
@@ -883,7 +875,7 @@
},
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app",
"navigationBarTitleText": "地标文化特产",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8"
},
pages/chose-city/chose-city.vue
+35 -36
View File
@@ -126,13 +126,13 @@
</template>
<script>
import MescrollMixins from "@/mixins/mescroll-mixins.js";
import {fetchCity} from "@/api/wenwan";
import MescrollBody from "@/components/mescroll-uni/mescroll-body.vue";
import {getCurAddress, getLocation} from "@/utils/common.js";
import MescrollMixins from '@/mixins/mescroll-mixins.js'
import {fetchCity} from '@/api/wenwan'
import MescrollBody from '@/components/mescroll-uni/mescroll-body.vue'
import {getCurAddress, getLocation} from '@/utils/common.js'
export default {
name: "choseCity",
name: 'ChoseCity',
components: {
MescrollBody
},
@@ -143,8 +143,7 @@ export default {
// 此时mescroll会携带page的参数:
// let pageNum = mescroll.num; // 页码, 默认从1开始
// let pageSize = mescroll.size; // 页长, 默认每页10条
mescroll.endSuccess(10);
mescroll.endSuccess(10)
}
})
],
@@ -162,23 +161,23 @@ export default {
auto: true
},
listGroup: [],
provinceName: "",
provinceName: '',
listCity: [],
navActive: 0,
keyword: "",
keyword: '',
type: null,
location: "",
location: '',
banner: {},
recommendInfo: null // 推荐信息
};
}
},
onLoad(options) {
this.type = Number(options.type);
this.location = options.city;
this.type = Number(options.type)
this.location = options.city
if (this.location === undefined) {
this.getMapData();
this.getMapData()
}
this.init();
this.init()
},
methods: {
reload() {
@@ -218,20 +217,20 @@ export default {
})
},
async getMapData() {
const map = await getLocation();
const map = await getLocation()
if (map) {
const {latitude, longitude} = map[1];
const address = await getCurAddress(latitude, longitude);
this.location = address[1].data.result.ad_info.city;
const {latitude, longitude} = map[1]
const address = await getCurAddress(latitude, longitude)
this.location = address[1].data.result.ad_info.city
}
},
init() {
fetchCity(this.type).then(res => {
if (res.success) {
this.listGroup = res.data.group;
this.listGroup = res.data.group
if (this.listGroup.length > 0) {
this.listCity = this.listGroup[0].city;
this.provinceName = this.listGroup[0].label;
this.listCity = this.listGroup[0].city
this.provinceName = this.listGroup[0].label
this.recommendInfo = this.listGroup[0].recommendInfo
this.banner = {
...this.listGroup[0],
@@ -243,9 +242,9 @@ export default {
})
},
asideTap(index) {
this.navActive = index;
this.listCity = this.listGroup[index].city;
this.provinceName = this.listGroup[index].label;
this.navActive = index
this.listCity = this.listGroup[index].city
this.provinceName = this.listGroup[index].label
this.recommendInfo = this.listGroup[index].recommendInfo
this.banner = {
...this.listGroup[index],
@@ -253,8 +252,8 @@ export default {
url: this.listGroup[index].uniappUrl
}
// 触发加载请求
this.mescroll.scrollTo(0, 0);
this.mescroll && this.mescroll.resetUpScroll(false);
this.mescroll.scrollTo(0, 0)
this.mescroll && this.mescroll.resetUpScroll(false)
},
emptyClick: function () {
//触发加载请求
@@ -262,9 +261,9 @@ export default {
},
search() {
this.listGroup.findIndex((group, index) => {
let result;
let result
group.city.forEach(item => {
result = item.cityName.indexOf(this.keyword, 0);
result = item.cityName.indexOf(this.keyword, 0)
if (result !== -1) {
this.asideTap(index);
return null;
@@ -276,8 +275,8 @@ export default {
})
},
select(item) {
if (this.type === 0 && item.hasData === 0) return;
if ((this.type === 1 || this.type === 2) && item.hasShop === 0) return;
if (this.type === 0 && item.hasData === 0) return
if ((this.type === 1 || this.type === 2) && item.hasShop === 0) return
uni.setStorageSync("cityName", item.cityName)
switch (this.type) {
@@ -285,20 +284,20 @@ export default {
uni.navigateTo({
url: `/pkg_product/views/nativeList?cityId=${item.cityId}`
})
break;
break
case 1:
uni.navigateTo({
url: `/wenwan/views/storeList?cityId=${item.cityId}`
})
break;
break
case 6:
uni.navigateTo({
url: `/pkg_product/views/scenicSpot?cityId=${item.cityId}`
})
break;
break
default:
uni.navigateBack()
break;
break
}
},
goToStore(id) {
@@ -306,7 +305,7 @@ export default {
return
}
uni.navigateTo({
url: "/pagesInn/inn/innHome?id=" + id
url: '/pagesInn/inn/innHome?id=' + id
})
},
goToGoods(productId) {
pages/cloud/components/HotelItem.vue
+110
View File
@@ -0,0 +1,110 @@
<template>
<view class="cover-box-wrap">
<view class="cover-box">
<image
:src="item.cover"
class="cover"
mode="scaleToFill"
/>
<view class="my-mask">
<image
class="icon"
:src="webUrl + '/20220510142728577618.png'"
mode="scaleToFill"
/>
<text>{{ item.cityName }}</text>
</view>
</view>
<view class="more-t">{{ item.content }}</view>
<view class="flex ai-center bottom">
<image
v-if="item.logo"
:src="item.logo"
class="logo"
mode="scaleToFill"
></image>
<image
v-else
:src="webUrl + '/20230609145651814148.png'"
class="logo"
/>
<text class="one-t">{{ item.name }}</text>
</view>
</view>
</template>
<script>
export default {
name: 'FunHotelItem',
props: {
item: {
type: Object,
default: () => {
return {}
}
}
},
data() {
return {
webUrl: this.$VUE_APP_RESOURCES_URL
}
}
}
</script>
<style scoped lang="less">
.cover-box-wrap {
margin: 20rpx 0 0 0;
.cover-box {
position: relative;
width: 328rpx;
height: auto;
border-radius: 14rpx;
overflow: hidden;
}
.cover {
width: 328rpx;
height: 328rpx;
vertical-align: middle;
}
.icon {
width: 26rpx;
height: 26rpx;
margin-top: -6rpx;
margin-right: 6rpx;
vertical-align: middle;
}
.logo {
width: 36rpx;
height: 36rpx;
vertical-align: middle;
margin: 0 8rpx;
border-radius: 50%;
}
.item {
width: 328rpx;
box-sizing: border-box;
}
.my-mask {
position: absolute;
bottom: 0;
left: 0;
width: 100%;
height: 60rpx;
line-height: 60rpx;
box-sizing: border-box;
padding: 0 24rpx;
background: linear-gradient(rgba(51, 51, 51, 0), rgba(0, 0, 0, 1));
color: #fff;
font-size: 24rpx;
}
.more-t {
margin: 10rpx;
}
.one-t {
color: #666;
font-size: 24rpx;
}
.bottom {
margin: 0 0 20rpx 0;
}
}
</style>
pages/cloud/haveFun.vue
+152 -178
View File
@@ -1,117 +1,36 @@
<script>
import {getHotelList, getHotelTypeList} from "@/api/inn.js";
import {getCurAddress, getLocation} from "@/utils/common";
export default {
data() {
return {
webUrl: this.$VUE_APP_RESOURCES_URL,
name: "",
page: 1,
typeList: [],
typeIndex: 0,
cityName: "",
hotelList: [],
}
},
onLoad() {
this.getMapData();
getHotelTypeList().then(({data}) => {
this.typeList = data;
});
},
onShow() {
let memCityName = uni.getStorageSync("cityName")
if (memCityName.length) {
this.cityName = memCityName;
uni.removeStorageSync("cityName")
this.search();
}
},
onReachBottom() {
if (!this.cityName) {
return
}
this.page++;
this.fetchList();
},
methods: {
goCity() {
uni.navigateTo({
url: `/pages/chose-city/chose-city?type=2&city=${this.cityName}`
})
},
goInnDetail(item) {
uni.navigateTo({
url: `/pagesInn/inn/innHome?id=${item.id}`
})
},
async getMapData() {
const map = await getLocation();
if (map.length > 1) {
const {latitude, longitude} = map[1];
const address = await getCurAddress(latitude, longitude);
this.cityName = address[1].data.result.ad_info.city;
this.search();
}
},
tapType(index) {
if (this.typeIndex === index) return;
this.typeIndex = index;
this.search();
},
search() {
this.page = 1;
this.hotelList = [];
this.fetchList();
},
fetchList() {
let param = {
page: this.page,
type: this.typeList[this.typeIndex].id,
cityName: this.cityName
};
let name = this.name.trim();
if (name.length > 0) param.name = name;
getHotelList(param).then(res => {
if (res.status === 200) {
for (let i = 0; i < res.data.length; i++) {
res.data[i].hide = true;
this.hotelList.push(res.data[i])
}
}
})
}
}
}
</script>
<template>
<view class="have-fun">
<!-- <u-navbar title="寻趣味" height="90rpx">-->
<!-- <view slot="left">&nbsp;</view>-->
<!-- </u-navbar>-->
<view class="top-box">
<view class="search-box flex jc-between ai-center">
<input type="text" v-model="name" placeholder="搜索店铺" placeholder-style="color:#949494"
@confirm="search">
<image class="icon" :src="webUrl+'/20220903142935869059.png'" mode="scaleToFill"
@click="search"/>
<input
v-model="name"
type="text"
placeholder="搜索店铺"
placeholder-style="color:#949494"
@confirm="search"
>
<image
class="icon"
:src="webUrl+'/20220903142935869059.png'"
mode="scaleToFill"
@click="search"
/>
</view>
<scroll-view class="type-box flex" scroll-x enable-flex>
<view class="item flex-0 flex flex-col jc-center ai-center" :class="{'active':typeIndex===index}"
v-for="(item,index) in typeList" :key="index" @click="tapType(index)">
<view
v-for="(item, index) in typeList"
:key="index"
:class="{
'active': typeIndex === index
}"
class="item flex-0 flex flex-col jc-center ai-center"
@click="tapType(index)"
>
<image :src="item.icon" mode="scaleToFill"/>
<view class="name">{{ item.name }}</view>
</view>
</scroll-view>
</view>
<view class="body">
<view class="flex jc-end">
<view class="city-box" @click="goCity('cloud')">
@@ -119,41 +38,150 @@ export default {
<text>{{ cityName }}</text>
</view>
</view>
<view class="list" v-if="hotelList.length">
<custom-waterfalls-flow :value="hotelList" imageKey="cover">
<view v-if="isLoad">
<view v-if="hotelList.length > 0">
<view class="list-wrapper">
<view class="list">
<view
v-for="(item,index) in hotelList"
v-for="(item, index) in hotelEvenList"
:key="index"
class="item"
@click="goInnDetail(item)"
>
<view class="cover-box">
<image class="cover" :src="item.cover" mode="scaleToFill"></image>
<view class="my-mask">
<image class="icon" :src="webUrl+'/20220510142728577618.png'"
mode="scaleToFill"></image>
<text>{{ item.cityName }}</text>
<fun-hotel-item :item="item" />
</view>
</view>
<view class="more-t">{{ item.content }}</view>
<view class="flex ai-center" style="margin-bottom: 18rpx;">
<image class="logo" :src="item.logo" mode="scaleToFill" v-if="item.logo"></image>
<image class="logo" :src="webUrl+'/20230609145651814148.png'" v-else/>
<text class="one-t">{{ item.name }}</text>
<view class="list">
<view
v-for="(item, index) in hotelOddList"
:key="index"
class="item"
@click="goInnDetail(item)"
>
<fun-hotel-item :item="item" />
</view>
</view>
</view>
</custom-waterfalls-flow>
</view>
<view class="v4-nodata" v-else>
<image src="@/static/images/img_nodata.png" mode="scaleToFill"/>
<view class="text">暂无数据</view>
</view>
</view>
<goo-skeleton v-else />
</view>
</view>
</template>
<script>
import { getHotelList, getHotelTypeList } from "@/api/inn.js"
import { getCurAddress, getLocation } from "@/utils/common"
import GooSkeleton from '@/components/GooSkeleton/index.vue'
import FunHotelItem from './components/HotelItem'
export default {
components: {
GooSkeleton,
FunHotelItem
},
data() {
return {
webUrl: this.$VUE_APP_RESOURCES_URL,
name: '',
page: 1,
typeList: [],
typeIndex: 0,
cityName: '',
hotelList: [],
isLoad: false
}
},
computed: {
hotelOddList() {
const arr = this.hotelList.filter(function(item, index) { return index % 2 === 1 })
return arr
},
hotelEvenList() {
const arr = this.hotelList.filter(function(item, index) { return index % 2 === 0 })
return arr
}
},
onLoad() {
this.getMapData()
getHotelTypeList().then(({data}) => {
this.typeList = data;
})
},
onShow() {
const memCityName = uni.getStorageSync('cityName')
if (memCityName.length) {
this.cityName = memCityName
uni.removeStorageSync('cityName')
this.search()
}
},
methods: {
goCity() {
uni.navigateTo({
url: `/pages/chose-city/chose-city?type=2&city=${this.cityName}`
})
},
goInnDetail(item) {
uni.navigateTo({
url: `/pagesInn/inn/innHome?id=${item.id}`
})
},
async getMapData() {
const map = await getLocation()
if (map.length > 1) {
const {latitude, longitude} = map[1]
const address = await getCurAddress(latitude, longitude)
this.cityName = address[1].data.result.ad_info.city
this.search()
}
},
tapType(index) {
if (this.typeIndex === index) return
this.typeIndex = index
this.search()
},
search() {
this.isLoad = false
this.page = 1
this.hotelList = []
this.fetchList()
},
fetchList() {
const param = {
page: this.page,
type: this.typeList[this.typeIndex].id,
cityName: this.cityName
}
const name = this.name.trim()
if (name.length > 0) {
param.name = name
}
getHotelList(param).then(res => {
const { success, data } = res
if (success) {
for (let i = 0; i < data.length; i++) {
const cover = data[i].cover
data[i].hide = true
// 视频封面取第一帧图片
if (data[i].coverType === 2) {
data[i].videoCover = cover
data[i].cover = (cover + '?vframe/jpg/offset/1')
} else {
data[i].videoCover = ''
}
this.hotelList.push(data[i])
}
}
}).finally(() => {
this.isLoad = true
})
}
}
}
</script>
<style scoped lang="less">
.have-fun {
//padding-top: 120rpx;
@@ -240,70 +268,16 @@ export default {
}
}
.list-wrapper {
display: flex;
justify-content: space-between;
.list {
margin-top: 20rpx;
.cover {
width: 328rpx;
height: 328rpx;
vertical-align: middle;
}
.icon {
width: 26rpx;
height: 26rpx;
margin-top: -6rpx;
margin-right: 6rpx;
vertical-align: middle;
}
.logo {
width: 36rpx;
height: 36rpx;
vertical-align: middle;
margin: 0 8rpx;
border-radius: 50%;
}
.item {
width: 328rpx;
box-sizing: border-box;
}
.cover-box {
position: relative;
width: 328rpx;
height: auto;
border-radius: 14rpx;
overflow: hidden;
.my-mask {
position: absolute;
bottom: 0;
left: 0;
width: 100%;
height: 60rpx;
line-height: 60rpx;
box-sizing: border-box;
padding: 0 24rpx;
background: linear-gradient(rgba(51, 51, 51, 0), rgba(0, 0, 0, 1));
color: #fff;
font-size: 24rpx;
}
}
.more-t {
margin: 10rpx;
}
.one-t {
color: #666;
font-size: 24rpx;
}
}
/deep/ .waterfalls-flow-column .column-value {
background-color: rgba(0, 0, 0, 0) !important;
}
}
</style>
pages/home/index.vue
+3 -1
View File
@@ -211,7 +211,9 @@
<view class="msg_title">
{{ unReadMessageInfo.noticeTitle }}
</view>
<view class="msg_content" v-html="unReadMessageInfo.noticeContent"></view>
<view class="msg_content">
<rich-text :nodes="unReadMessageInfo.noticeContent" />
</view>
<view class="msg_line"></view>
<view class="msg_btn" @click="msgConfirm">我知道了</view>
</view>
pages/shop/GoodSearch/index.vue
+36 -29
View File
@@ -2,36 +2,41 @@
<view class="good-search">
<view class="header">
<view class="search-box flex jc-between ai-center">
<input v-model="search" type="text" placeholder="搜索商品" placeholder-style="color:#999"/>
<input
v-model.trim="search"
type="text"
placeholder="搜索商品"
placeholder-style="color:#999"
/>
<view class="btn flex-0 flex jc-center ai-center" @click="submit">
<text class="iconfont icon-sousuo2"></text>
<text>搜索</text>
</view>
</view>
</view>
<view class="page-content" v-if="historyKey.length">
<view v-if="historyKey.length" class="page-content">
<view class="title">历史搜索</view>
<view class="list acea-row limit-box">
<view
class="item"
v-for="item of historyKey"
:key="item.id"
class="item"
@click="toSearch(item.word)"
>{{ item.word }}
>
{{ item.word }}
</view>
</view>
</view>
<view class="page-content" v-if="keywords.length">
<view class="title">热门搜索</view>
<view class="list acea-row">
<view
class="item"
v-for="keywordsKey of keywords"
:key="keywordsKey"
class="item"
@click="toSearch(keywordsKey)"
>{{ keywordsKey }}
>
{{ keywordsKey }}
</view>
</view>
</view>
@@ -40,19 +45,18 @@
</template>
<script>
import {getSearchKeyword} from "@/api/store";
import {trim} from "@/utils";
import {getSearchKeyword} from '@/api/store'
import {trim} from '@/utils'
export default {
name: "GoodSearch",
name: 'GoodSearch',
props: {},
data: function () {
return {
webUrl: this.$VUE_APP_RESOURCES_URL,
keywords: [],
search: "",
search: '',
historyKey: []
};
}
},
mounted: function () {
this.getData();
@@ -62,29 +66,32 @@ export default {
},
methods: {
submit() {
const search = trim(this.search) || "";
if (!search) return;
this.historyKey.unshift({id: this.$global.generateMixed(10), word: search});
this.setHistory();
this.search = "";
this.toSearch(search);
const search = trim(this.search) || ''
if (!search) return
this.setHistory(search)
this.search = ''
this.toSearch(search)
},
toSearch(s) {
this.$yrouter.push({path: "/pages/shop/GoodsList/index", query: {s}});
this.setHistory(s)
this.$yrouter.push({path: '/pages/shop/GoodsList/index', query: {s}})
},
getData() {
getSearchKeyword().then(res => {
this.keywords = res.data;
});
this.keywords = res.data
})
},
getHistory() {
let temp = JSON.parse(uni.getStorageSync("historyKey")) || [];
this.historyKey = temp.slice(0, 30);
let temp = JSON.parse(uni.getStorageSync('historyKey') || '[]')
this.historyKey = temp.slice(0, 30)
},
setHistory() {
uni.setStorageSync("historyKey", JSON.stringify(this.historyKey));
setHistory(word) {
const index = this.historyKey.findIndex(item => item.word === word)
if (index > -1) {
return
}
this.historyKey.unshift({id: this.$global.generateMixed(10), word })
uni.setStorageSync('historyKey', JSON.stringify(this.historyKey))
}
}
};
pages/shop/GoodsCon/index.vue
+11 -4
View File
@@ -210,9 +210,15 @@
<view class="service-section goods-section" v-if="storeInfo && storeInfo.isTickets!=1">
<view class="cell flex jc-between ai-center" @click="changeCoupons()" v-if="couponList['usable'].length>0">
<view>
<text class="coupon-label tc" v-for="(item,index) in couponList.usable" :key="index" v-if="index<2">
<template v-for="(item, index) in couponList.usable">
<text
v-if="index < 2"
:key="index"
class="coupon-label tc"
>
{{ item.couponTitle }}
</text>
</template>
</view>
<view class="value">优惠详情
<uni-icons type="right" size="13" color="#707070"></uni-icons>
@@ -403,7 +409,9 @@
<!-- 购买须知开始 -->
<view class="acea-row row-column bg-white" style="padding: 20rpx;border-width: 2px;border-color: #939390;">
<view class="conter" v-html="buyNotice"></view>
<view class="conter">
<rich-text :nodes="buyNotice" />
</view>
</view>
<!-- 购买须知结束 -->
@@ -939,9 +947,8 @@ export default {
},
// 2022/9/28 add
goStore() {
let path = this.isWenwan === 0 ? "/pagesInn/inn/innHome" : "/wenwan/views/store";
this.$yrouter.push({
path,
path: "/pagesInn/inn/innHome",
query: {
id: this.systemStore.id
}
pages/shop/GoodsCon/index_bak20240206.vue
-1894
View File
File diff suppressed because it is too large Load Diff
pages/user/User/index.vue
+22 -5
View File
@@ -84,12 +84,12 @@
</view>
<view class="my-wrapper wrapper">
<view class="myOrder">
<view class="title acea-row row-between-wrapper">
<view class="title acea-row row-between-wrapper" @click="goMyOrder(0)">
<view class="acea-row row-middle">
<text class="line"></text>
<text>我的订单</text>
</view>
<text @click="goMyOrder(0)" class="allOrder">
<text class="allOrder">
<text class="iconfont icon-jiantou"></text>
</text>
</view>
@@ -206,6 +206,7 @@
:src="bannerBgUrl"
mode="widthFix"
class="bg"
@click="bannerClickHandle"
/>
</view>
</view>
@@ -316,9 +317,10 @@ export default {
},
{
text: '帮助中心',
url: '/pages/user/Message/Message',
url: '',
icon: '/icon/icon-help.png',
allowEnter: true
allowEnter: true,
showTip: true
},
{
text: '设置中心',
@@ -327,7 +329,8 @@ export default {
allowEnter: true
}
],
bannerBgUrl: ''
bannerBgUrl: '',
userCenterBannerUrl: ''
}
},
computed: mapGetters(['userInfo']),
@@ -435,6 +438,7 @@ export default {
if (success) {
if (data.userCenterBanner) {
this.bannerBgUrl = data.userCenterBanner
this.userCenterBannerUrl = data.userCenterBannerUrl || ''
}
}
})
@@ -468,6 +472,12 @@ export default {
},
toolItemClickHandle(item) {
const url = item.url
if (item.showTip) {
this.$dialog.toast({
mes: '暂未开放'
})
return
}
if (!url || !item.allowEnter) {
return
}
@@ -478,6 +488,12 @@ export default {
return
}
uni.navigateTo({ url })
},
bannerClickHandle() {
if (!this.userCenterBannerUrl) {
return
}
this.linkTo(this.userCenterBannerUrl)
}
}
}
@@ -627,6 +643,7 @@ export default {
.qrcode {
display: flex;
align-items: center;
width: 160rpx;
padding: 10rpx 16rpx;
border: 1rpx solid #FFFBD3;
border-radius: 8rpx;
pagesInn/components/jin-edit/jin-edit.vue
+32 -5
View File
@@ -1,17 +1,19 @@
<template>
<view class="container" :style="{height: height}">
<editor
ref="editot"
id="editor"
class="ql-container"
:placeholder="placeholder"
:show-img-size="true"
:show-img-toolbar="true"
:show-img-resize="true"
:read-only="readOnly"
placeholder-style="font-size:24rpx;color:#C2C5CC;"
@ready="onEditorReady"
id="editor"
@statuschange="statuschange"
@focus="editFocus"
@blur="editBlur"
ref="editot"
></editor>
<!-- 操作工具 -->
<view class="tool-view" >
@@ -36,7 +38,7 @@
</view>
</view>
<view class="tool">
<!-- <jinIcon class="single" type="&#xe6f3;" title="图片" @click="insertImage"></jinIcon> -->
<jinIcon class="single" type="&#xe6f3;" title="图片" @click="insertImage"></jinIcon>
<jinIcon class="single" type="&#xe6f9;" title="格式" @click="showMore" :color="showMoreTool ? activeColor : '#666666'"></jinIcon>
<jinIcon class="single" type="&#xe6eb;" title="分割线" @click="insertDivider"></jinIcon>
<jinIcon class="single" type="&#xe6e8;" title="撤回" @click="undo"></jinIcon>
@@ -49,8 +51,15 @@
<script>
import jinIcon from './jin-icons.vue';
import {
chooseImage
} from '@/utils'
export default {
props: {
readOnly: {
type: Boolean,
default: false
},
// 点击图片时显示图片大小控件
showImgSize: {
type: Boolean,
@@ -127,14 +136,32 @@ export default {
},res => {
this.editorCtx = res.context;
this.editorCtx.setContents({
html: this.html
html: this.html,
success: () => {
this.editorCtx.blur()
}
})
setTimeout(() => {
uni.pageScrollTo({
scrollTop: 0,
duration: 0
})
}, 500)
})
.exec();
},
undo() {
this.editorCtx.undo();
},
insertImage() {
const _this = this
chooseImage((path) => {
_this.editorCtx.insertImage({
src: path,
alt: '图片'
})
})
},
/// 插入分割线
insertDivider() {
this.editorCtx.insertDivider();
@@ -238,7 +265,7 @@ export default {
.ql-container {
line-height: 150%;
font-size: 22rpx;
font-size: 28rpx;
width: 100%;
height: 240px;
background: #fff;
pagesInn/components/jin-edit/jin-icons.vue
+2 -2
View File
@@ -23,7 +23,7 @@
},
fontSize: {
type: String,
default: '32rpx'
default: '36rpx'
},
title: {
type: String,
@@ -53,7 +53,7 @@
bottom: 0;
width: 100%;
text-align: center;
font-size: 8px;
font-size: 12px;
color: #666;
line-height: 8px;
transform: translateY(-8px);
pagesInn/inn/innHome.vue
+92 -18
View File
@@ -29,8 +29,8 @@
<video
:src="inn.cover"
:autoplay="true"
:controls="false"
:loop="true"
:controls="true"
:loop="false"
object-fit="contain"
play-btn-position="center"
class="video"
@@ -149,6 +149,8 @@
<view :class="isMyInn ? 'my-inn-page' : ''">
<!-- v4 商品列表 -->
<view v-if="activeIndex === 0" class="goods-section">
<view v-if="isLoadGoodListoSuccess">
<view v-if="goodsList.length > 0">
<view class="flex flex-wrap">
<view
v-for="(item,index) in goodsList"
@@ -181,18 +183,25 @@
</view>
</view>
</view>
<view v-show="goodsList.length > 0" class="btn">
<view class="btn">
<view class="btn-cont" @click="viewAllGoodHandle">
查看所有商品
<text class="iconfont icon-jiantou"></text>
</view>
</view>
</view>
<view v-else class="tab-no-data">
店主还没有上传内容哦~
</view>
</view>
<goo-skeleton v-else />
</view>
<!-- 最新资讯 -->
<view
v-if="activeIndex === 1"
class="info-section"
>
<view v-if="isLoadInfoListSuccess">
<view v-if="infoArray.length > 0" class="info-wrapper">
<view class="info-list">
<view
@@ -248,10 +257,22 @@
</view>
<view class="flex">
<image
v-if="!item.zanVo"
:src="webUrl + '/page/hotel/zan-off.png'"
class="zan-off-icon"
@click="likeInfoItemHandle(item, index, 1)"
/>
<image
v-else
:src="webUrl + '/page/hotel/zan-on.png'"
class="zan-on-icon"
@click="likeInfoItemHandle(item, index, 0)"
/>
<!-- <image
:src="webUrl + '/20230803151302213857.png'"
class="icon"
/>
<text class="seeNum-txt">{{ item.zan }}</text>
<text class="seeNum-txt">{{ item.zan }}</text> -->
</view>
<view v-if="isMyInn" class="flex more-btn" @click="toggleMoreHandle(index)">
<image
@@ -279,7 +300,7 @@
@click="setTopInfoHandle(item, 0)"
>
<image
:src="webUrl + '/page/hotel/delete.png'"
:src="webUrl + '/page/hotel/down.png'"
class="more-icon"
/>
取消置顶
@@ -298,6 +319,11 @@
</view>
</view>
</view>
<view v-else class="tab-no-data">
店主还没有上传内容哦~
</view>
</view>
<goo-skeleton v-else />
</view>
<!-- 企业文化 -->
<view
@@ -325,12 +351,16 @@
/>
</view>
</view>
<view v-else class="tab-no-data">
店主还没有上传内容哦~
</view>
</view>
<!-- 商家资质 -->
<view
v-if="activeIndex === 3"
class="qualifications-section"
>
<view v-if="inn.qualifications.length > 0">
<image
v-for="(item, index) in inn.qualifications"
:key="index"
@@ -339,6 +369,10 @@
mode="widthFix"
/>
</view>
<view v-else class="tab-no-data">
店主还没有上传内容哦~
</view>
</view>
</view>
<view v-if="isMyInn" class="bottom-view acea-row">
<view class="bottom-btn" @click="publishBtnClick">
@@ -386,7 +420,8 @@ import {
getPoster,
getHotelGoodList,
postHotelNewsDel,
setTopHotelNew
setTopHotelNew,
getHotelNewsZan
} from "@/api/inn.js"
import {formatDateTime} from "@/utils"
import {getUrlParam} from "@/utils/common.js"
@@ -434,14 +469,16 @@ export default {
{ text: '最新资讯', value: 1, isShow: true },
{ text: '企业文化', value: 2, isShow: true },
{ text: '商家资质', value: 3, isShow: true }
]
],
isLoadGoodListoSuccess: false,
isLoadInfoListSuccess: false
}
},
// 必须在页面加 onPageScroll(e){} ，才能滑动显示背景
onPageScroll(e) {
this.scrollData = e
},
onLoad: function (options) {
onLoad(options) {
if (options.id) {
this.id = options.id || null
this.partnerId = options.partnerId || null
@@ -469,7 +506,7 @@ export default {
if (!this.isLoad) {
return
}
if (this.inn.hasProduct <= 0) {
if (this.inn.hasProduct > 0) {
this.fetchGoods()
}
this.fetchInnInfoList()
@@ -568,7 +605,7 @@ export default {
})
},
infoClick: function (info) {
this.$yrouter.push('/pagesInn/inn/innInfoDetail?id=' + info.id)
// this.$yrouter.push('/pagesInn/inn/innInfoDetail?id=' + info.id)
},
publishBtnClick: function () {
this.$yrouter.push('/pagesInn/inn/innInfoPublish?hotelId=' + this.inn.id)
@@ -617,6 +654,7 @@ export default {
if (_this.loading) {
return
}
_this.isLoadInfoListSuccess = false
_this.loading = true
_this.infoArray = []
getHotelNewsList({
@@ -635,6 +673,7 @@ export default {
}))
}).finally(() => {
_this.loading = false
_this.isLoadInfoListSuccess = true
uni.stopPullDownRefresh()
})
},
@@ -733,7 +772,6 @@ export default {
this.fetchInnInfoList()
break
case 0:
this.goodsList = []
this.fetchGoods()
break
default:
@@ -741,6 +779,8 @@ export default {
}
},
fetchGoods() {
this.isLoadGoodListoSuccess = false
this.goodsList = []
getHotelGoodList({
id: this.inn.id,
page: 1,
@@ -755,6 +795,8 @@ export default {
}
}
}
}).finally(() => {
this.isLoadGoodListoSuccess = true
})
},
call: function () {
@@ -809,10 +851,27 @@ export default {
this.$dialog.toast({
mes: '操作成功!'
})
setTimeout(() => {
uni.hideLoading()
}, 3000)
this.fetchInnInfoList()
}
}).finally(() => {
}).catch(() => {
setTimeout(() => {
uni.hideLoading()
}, 3000)
})
},
likeInfoItemHandle(item, index, value) {
getHotelNewsZan(item.id).then(res => {
const { success } = res
if (success) {
this.$dialog.toast({
mes: '操作成功!'
})
this.$set(this.infoArray[index], 'zanVo', value)
// this.fetchInnInfoList()
}
})
}
}
@@ -823,6 +882,7 @@ export default {
@import "@/assets/css/store.less";
.my-inn-page {
padding: 0 0 100rpx 0;
background-color: #f6f6f6;
}
.cover-box {
position: relative;
@@ -1145,7 +1205,7 @@ export default {
z-index: 5;
display: flex;
align-items: center;
padding: 40rpx 32rpx;
padding: 40rpx 10rpx 40rpx 32rpx;
color: #333;
font-size: 14px;
.map-info-hd {
@@ -1162,16 +1222,16 @@ export default {
}
.map-info-ft {
.item + .item {
margin: 0 0 0 36rpx;
margin: 0 0 0 6rpx;
}
.item {
text-align: center;
font-weight: bold;
font-weight: 500;
.img {
display: block;
width: 72rpx;
height: 72rpx;
margin: 0 0 20rpx 0;
width: 96rpx;
height: 96rpx;
margin: 0 0 -16rpx 0;
}
}
}
@@ -1259,6 +1319,14 @@ export default {
height: 32rpx;
margin: 0 8rpx 0 0;
}
.zan-off-icon {
width: 138rpx;
height: 40rpx;
}
.zan-on-icon {
width: 80rpx;
height: 40rpx;
}
.more-btn {
position: relative;
.more-wrapper {
@@ -1292,4 +1360,10 @@ export default {
}
}
}
.tab-no-data {
text-align: center;
font-size: 32rpx;
color: #999;
line-height: 200rpx;
}
</style>
pagesInn/inn/innInfoPublish.vue
+38 -39
View File
@@ -37,23 +37,26 @@
:dataList="picsArray"
:upload_img_wh="uploadImgWH"
:upload_max="uploadMax"
:upload_count="uploadCount"
:url="uploadUrl"
:type='uploadType'
:header="uploadHeader"
@change="uploadedImgChange"
/>
</view>
<!--
<view class="form-item">
<view class="title">资讯详情:</view>
<view class="inp">
<jin-edit
:html="form.content"
placeholder="请输入内容"
placeholder="请输入内容..."
height="320px"
@editOk="editOk"
/>
</view>
</view>
-->
<view class="form-btn">
<button form-type="submit">发布</button>
</view>
@@ -62,22 +65,19 @@
</template>
<script>
import tmUpload from '@/pagesInn/components/tm-upload/tm-upload.vue';
import jinEdit from '@/pagesInn/components/jin-edit/jin-edit.vue';
import tmUpload from '@/pagesInn/components/tm-upload/tm-upload.vue'
import {
VUE_APP_API_URL
} from "@/config";
} from '@/config'
import {
postHotelNewsAdd
} from "@/api/inn.js";
} from '@/api/inn.js'
export default {
components: {
tmUpload,
jinEdit
tmUpload
},
data() {
return {
webUrl: this.$VUE_APP_RESOURCES_URL,
uploadUrl: VUE_APP_API_URL + '/api/upload',
uploadType: 'image',
uploadCount: 9,
@@ -89,18 +89,17 @@
uploadMax:10,
picsArray: [],
showUpload: true,
hotelId: 0,
tabData: [{
label: "图文动态",
type: "NT_TEXT",
uploadType: "image",
label: '图文动态',
type: 'NT_TEXT',
uploadType: 'image',
uploadCount: 9
},
{
label: "视频动态",
type: "NT_VIDEO",
uploadType: "video",
label: '视频动态',
type: 'NT_VIDEO',
uploadType: 'video',
uploadCount: 1
}
],
@@ -113,17 +112,16 @@
}
},
onLoad(option) {
this.hotelId = option.hotelId;
this.hotelId = option.hotelId
},
methods: {
changeTab(index) {
this.tabIndex = index;
this.showUpload = false;
this.uploadType = this.tabData[index].uploadType;
this.uploadCount = this.tabData[index].uploadCount;
this.tabIndex = index
this.showUpload = false
this.uploadType = this.tabData[index].uploadType
this.uploadCount = this.tabData[index].uploadCount
setTimeout(()=>{
this.showUpload = true;
this.showUpload = true
},100)
},
editOk(res) {
@@ -131,45 +129,45 @@
},
//文件上传结果
uploadedImgChange: function(uploadedFilesList) {
this.uploadedFilesArray = uploadedFilesList;
this.uploadedFilesArray = uploadedFilesList
},
formSubmit(e) {
if (!this.form.title) {
this.$dialog.error("请输入动态标题");
return;
this.$dialog.error('请输入动态标题')
return
}
if (!this.form.intro) {
this.$dialog.error("请输入简介");
return;
}
if (!this.form.content) {
this.$dialog.error("请输入资讯详情");
return;
this.$dialog.error('请输入简介')
return
}
// if (!this.form.content) {
// this.$dialog.error('请输入资讯详情')
// return
// }
if (this.uploadedFilesArray.length == 0) {
this.$dialog.error("请上传动态图片或视频");
return;
this.$dialog.error('请上传动态图片或视频')
return
}
uni.showLoading();
postHotelNewsAdd({
hotelId: this.hotelId,
name: this.form.title,
intro: this.form.intro,
content: this.form.content,
content: this.form.content.replace(/\<img src/g, '<img style="display: block;max-width: 100%;" src'),
type: this.uploadType === 'image' ? 'NT_TEXT' : 'NT_VIDEO',
resources: this.uploadType === 'image' ? this.uploadedFilesArray : [],
video: this.uploadType === 'image' ? '' : this.uploadedFilesArray[0]
}).then(res => {
uni.hideLoading();
this.$dialog.toast({
mes: "发布成功!"
});
mes: '发布成功!'
})
setTimeout(() => {
this.$yrouter.back();
}, 1000);
this.$yrouter.back()
}, 3000)
}).catch((err) => {
uni.hideLoading();
this.$dialog.error(err.msg);
this.$dialog.error(err.msg)
})
}
}
@@ -221,6 +219,7 @@
padding: 10rpx 16rpx;
border: 1px solid #eee;
border-radius: 6rpx;
font-size: 28rpx;
}
.inp-input {
padding: 0 16rpx;
pagesInn/inn/innProfileEdit.vue
+2 -2
View File
@@ -99,7 +99,7 @@
</view>
</view>
</view>
<view class="item is_required">
<!-- <view class="item is_required">
<view class="cell acea-row row-column">
<view class="cell-title">店铺简介</view>
<view>
@@ -111,7 +111,7 @@
/>
</view>
</view>
</view>
</view> -->
<view class="item">
<view class="img-upload">
<tm-upload
components/gbro-marquee/marquee.vue → pkg-video/components/gbro-marquee/marquee.vue
View File
pkg-video/views/lottery.vue
+2 -2
View File
@@ -80,8 +80,8 @@
</template>
<script>
import {getDetail, getPrize, takePrize} from "@/api/lottery";
import gbroMarquee from "@/components/gbro-marquee/marquee.vue";
import { getDetail, getPrize, takePrize } from '@/api/lottery'
import gbroMarquee from '../components/gbro-marquee/marquee.vue'
export default {
components: { gbroMarquee },
pkg_product/views/festival.vue
+60 -23
View File
@@ -1,39 +1,74 @@
<template>
<view class="pkg-product-festival">
<hx-navbar
:fixed="true"
:background-color="[[13,197,197],[13,197,197]]"
statusBarFontColor="#ffffff"
barPlaceholder="hidden"
transparent="auto"
color='#ffffff'
/>
<view v-if="isLoad">
<image
v-if="topImage"
:src="topImage"
class="top-img"
mode="widthFix"
/>
<view
v-for="(content,cIndex) in contents"
:key="cIndex"
class="section"
>
<image
:src="content.backgroundImage"
class="section-bg"
mode="widthFix"
/>
<view
:class="cIndex === 0 ? 'section12' : 'section8'"
class="list flex flex-wrap"
>
<image
v-for="(item,index) in content.products"
:key="index"
:class="cIndex === 0 ? 'span12' : 'span8'"
:src="item.image"
mode="scaleToFill"
@click="$global.navToGoods(item.id)"
/>
</view>
</view>
</view>
<goo-skeleton v-else />
</view>
</template>
<script>
import {getFestival} from "@/api/product";
// 节日专题
import { getFestival } from '@/api/product'
import GooSkeleton from '@/components/GooSkeleton/index.vue'
export default {
name: "festival", // 节日专题
name: 'Festival',
components: {
GooSkeleton
},
data() {
return {
webUrl: this.$VUE_APP_RESOURCES_URL,
isLoad: false,
topImage: '',
contents: []
}
},
onLoad() {
getFestival().then(({data}) => {
this.topImage = data.topImage;
this.contents = data.contents;
this.isLoad = true
this.topImage = data.topImage
this.contents = data.contents
})
}
}
</script>
<template>
<view class="pkg-product-festival">
<image class="top-img" mode="widthFix" :src="topImage" v-if="topImage"/>
<view class="section" v-for="(content,cIndex) in contents" :key="cIndex">
<image class="section-bg" :src="content.backgroundImage" mode="widthFix"/>
<view class="list flex flex-wrap" :class="cIndex===0?'section12':'section8'">
<image :class="cIndex===0?'span12':'span8'" mode="scaleToFill" :src="item.image"
v-for="(item,index) in content.products" :key="index" @click="$global.navToGoods(item.id)"/>
</view>
</view>
</view>
</template>
<style scoped lang="less">
.pkg-product-festival {
image {
@@ -70,12 +105,14 @@ export default {
top: 350rpx;
left: 0;
width: 100vw;
justify-content: space-between;
box-sizing: border-box;
}
.span12 {
width: 332rpx;
height: 520rpx;
margin: 0 22rpx 24rpx 0;
margin: 0 0 24rpx 0;
}
.span12:nth-child(2n) {
@@ -85,7 +122,7 @@ export default {
.span8 {
width: 234rpx;
height: 384rpx;
margin: 0 8rpx 24rpx 0;
margin: 0 0 24rpx 0;
}
.span8:nth-child(3n) {
pkg_user/components/Coupons.vue
+142
View File
@@ -0,0 +1,142 @@
<template>
<view class="components-coupons">
<image class="coupons__cover" :src="data.image" mode="widthFix"/>
<view class="coupons__section flex jc-between ai-center">
<view>有效期至：
<text>{{ data.endTime }}</text>
</view>
<view class="coupons__tag coupons__tag-expire" v-if="data.status===2">已到期</view>
<view class="coupons__tag" @click="goGoods()" v-if="data.status===0 && !radioModel">去使用</view>
<view @click="selectCoupon">
<radio :value="data.id" :checked="data.checked" color="#FF564A" v-if="radioModel && data.status===0"/>
</view>
</view>
<view class="coupons__rules">
<view class="coupons__rules-title" @click="changeRules()">使用规则
<image :class="{'open':isOpen}" :src="webUrl+'/20231125220409665027.png'" mode="scaleToFill"/>
</view>
<view
:class="isOpen ? 'auto-height' : ''"
class="coupon-html"
>
<rich-text :nodes="data.description" />
</view>
</view>
</view>
</template>
<script>
export default {
name: "Coupons",
props: {
data: Object,
radioModel: {
type: Boolean,
default: false
},
checked: {
type: Boolean,
default: false
}
},
data() {
return {
webUrl: this.$VUE_APP_RESOURCES_URL,
isOpen: false
}
},
methods: {
changeRules() {
this.isOpen = !this.isOpen
},
goGoods() {
uni.switchTab({url: '/pages/home/landMark'})
// this.$global.navToGoods(this.data.productId)
},
selectCoupon() {
if (!this.radioModel) return
this.$emit('change', this.data.id)
}
}
}
</script>
<style scoped lang="less">
.components-coupons {
width: 686rpx;
box-sizing: border-box;
border: 2rpx solid #FF564A;
border-radius: 16rpx;
overflow: hidden;
image {
vertical-align: middle;
}
.coupons__cover {
width: 100%;
height: auto;
}
.coupons__section {
width: 100%;
box-sizing: border-box;
padding: 18rpx 20rpx 16rpx 16rpx;
font-size: 32rpx;
line-height: 1;
text {
color: #EA1C1C;
font-weight: bold;
}
.coupons__tag {
display: flex;
justify-content: center;
align-items: center;
width: 120rpx;
height: 52rpx;
box-sizing: border-box;
border-radius: 8rpx;
border: 2px solid #0DC5C5;
color: #0DC5C5;
font-size: 32rpx;
line-height: 1;
}
.coupons__tag-expire {
border: 2rpx solid #BFBFBF;
color: #999999;
}
}
.coupons__rules {
padding: 0 20rpx 20rpx 16rpx;
.coupons__rules-title {
color: #999999;
font-size: 28rpx;
image {
width: 26rpx;
height: 26rpx;
margin-left: 6rpx;
}
.open {
transform: rotate(180deg);
}
}
.coupon-html {
height: 80rpx;
overflow: hidden;
transition: all .3s;
&.auto-height {
height: auto;
}
}
}
}
</style>
pkg_user/views/myCoupons.vue
+4 -39
View File
@@ -5,23 +5,13 @@
<Coupons class="coupons" :data="item" v-for="(item,index) in list" :key="index"/>
<image class="zero-coupons" :src="webUrl+'/20231201201733142658.png'" mode="scaleToFill" v-if="list.length===0"/>
<!-- <view>-->
<!-- <button @tap="startRecord">开始录音</button>-->
<!-- <button @tap="endRecord">停止录音</button>-->
<!-- <button @tap="playVoice">播放录音</button>-->
<!-- </view>-->
</view>
</template>
<script>
import SubSection from "@/components/SubSection.vue";
import Coupons from "@/components/Coupons.vue";
import {getCouponsUser} from "@/api/user";
const recorderManager = uni.getRecorderManager();
const innerAudioContext = uni.createInnerAudioContext();
innerAudioContext.autoplay = true;
import SubSection from '@/components/SubSection.vue'
import Coupons from '../components/Coupons.vue'
import {getCouponsUser} from '@/api/user'
export default {
name: "myCoupons",
@@ -29,7 +19,6 @@ export default {
data() {
return {
webUrl: this.$VUE_APP_RESOURCES_URL,
voicePath: '',
current: 0,
canUse: 0,
notUse: 0,
@@ -37,34 +26,10 @@ export default {
}
},
onLoad() {
// let self = this;
// recorderManager.onStop(function (res) {
// console.log('recorder stop' + JSON.stringify(res));
// self.voicePath = res.tempFilePath;
// });
this.fetchList(1)
this.fetchList(2)
},
methods: {
startRecord() {
console.log('开始录音');
recorderManager.start();
},
endRecord() {
console.log('录音结束');
recorderManager.stop();
},
playVoice() {
console.log('播放录音');
if (this.voicePath) {
innerAudioContext.src = this.voicePath;
innerAudioContext.play();
}
},
changeNav(index) {
this.current = index
this.fetchList(index + 1)
@@ -79,7 +44,7 @@ export default {
if (type === 1) this.canUse = data.length
if (type === 2) this.notUse = data.length
})
},
}
}
}
</script>
uni_modules/custom-waterfalls-flow/components/custom-waterfalls-flow/custom-waterfalls-flow.vue
+41 -5
View File
@@ -1,8 +1,29 @@
<template>
<view class="waterfalls-flow">
<view v-for="(item,index) in data.column" :key="index" class="waterfalls-flow-column" :id="`waterfalls_flow_column_${index+1}`" :msg="msg" :style="{'width':w,'margin-left':index==0?0:m}">
<view :class="['column-value',{'column-value-show':item2.o}]" v-for="(item2,index2) in columnValue(index)" :key="index2" :style="[s1]" @click.stop="wapperClick(item2)">
<view class="inner" v-if="data.seat==1">
<view
v-for="(item, index) in data.column"
:key="index" class="waterfalls-flow-column"
:id="`waterfalls_flow_column_${index+1}`"
:msg="msg"
:style="{
'width': w,
'margin-left': index == 0 ? 0 : m
}"
>
<view
v-for="(item2, index2) in columnValue(index)"
:key="index2"
:class="[
'column-value',
{ 'column-value-show': item2.o }
]"
:style="[s1]"
@click.stop="wapperClick(item2)"
>
<view
v-if="data.seat == 1"
class="inner"
>
<!-- #ifdef MP-WEIXIN -->
<!-- #ifdef VUE2 -->
<slot name="slot{{item2.index}}"></slot>
@@ -15,8 +36,22 @@
<slot v-bind="item2"></slot>
<!-- #endif -->
</view>
<image :class="['img',{'img-hide':item2[hideImageKey]==true||item2[hideImageKey]==1},{'img-error':!item2[data.imageKey]}]" :src="item2[data.imageKey]" mode="widthFix" @load="imgLoad(item2,index+1)" @error="imgError(item2,index+1)" @click.stop="imageClick(item2)"></image>
<view class="inner" v-if="data.seat==2">
<image
:class="[
'img',
{ 'img-hide': item2[hideImageKey] == true || item2[hideImageKey] == 1 },
{ 'img-error': !item2[data.imageKey] }
]"
:src="item2[data.imageKey]"
mode="widthFix"
@load="imgLoad(item2, index+1)"
@error="imgError(item2, index+1)"
@click.stop="imageClick(item2)"
/>
<view
v-if="data.seat==2"
class="inner"
>
<!-- #ifdef MP-WEIXIN -->
<!-- #ifdef VUE2 -->
<slot name="slot{{item2.index}}"></slot>
@@ -156,6 +191,7 @@
this.msg++;
}
this.$nextTick(() => {
console.log(this.data.list)
this.initValue(this.curIndex, 'refresh==>');
})
}, 1)
utils/dialog.js
+4 -4
View File
@@ -49,7 +49,7 @@ dialog.message = (mes = "操作失败", obj = {}) => {
uni.showToast({
title: mes,
icon: "none",
duration: 2000,
duration: 3000,
complete: () => {
resolve();
}
@@ -61,7 +61,7 @@ dialog.toast = (options) => {
uni.showToast({
title: options.mes,
icon: "none",
duration: 2000,
duration: 3000,
complete: () => {
options.callback ? options.callback() : null
}
@@ -72,7 +72,7 @@ dialog.error = (mes) => {
uni.showToast({
title: mes,
icon: "none",
duration: 2000
duration: 3000
});
};
@@ -84,7 +84,7 @@ export function validatorDefaultCatch(err, type = "message") {
uni.showToast({
title: err.errors[0].message,
icon: 'none',
duration: 2000
duration: 3000
})
return false
}
utils/request.js
+1
View File
@@ -64,6 +64,7 @@ function baseRequest(options) {
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 3000,
success() {
}
})
wenwan/views/store.vue
-1048
View File
File diff suppressed because it is too large Load Diff
wenwan/views/storeList.vue
+1 -1
View File
@@ -84,7 +84,7 @@ export default {
goStore: function (item) {
// 跳转到客栈详情
uni.navigateTo({
url: `/wenwan/views/store?id=${item.id}`,
url: `/pagesInn/inn/innHome?id=${item.id}`,
})
},
search() {