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
2025-12-09 16:39:27 +08:00
parent b9dcbe6560 2f4d4510a5
commit 38545cd76e
28 changed files with 2752 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/gift.js
+23
View File
@@ -101,3 +101,26 @@ export function receiveSojoumGroupBuyGift(params) {
login: true
})
}
/**
* 旅居礼品卡送礼入口轮播图
* @param {*} params
* @returns
*/
export function fetchSojoumGroupBuyGiftCarousel(params) {
return request.get("/travel/giftCardTravelBanner",params, {
login: true
})
}
/**
* 计算旅居团购礼品订单价格
* @param {*} params
* @returns
*/
export function computedSojoumGroupBuyGiftOrderPrice(params) {
return request.post("/travel/giftCardOrder/computed/" + params.key, params, {
login: true
})
}
api/qianxian.js
+7 -4
View File
@@ -110,9 +110,9 @@ export function getSaleList(params) {
// }
// 旅居详情
// export function getJiaLouDetail(id) {
// return request.get('/countyFamous/sojourn/' + id, {}, {login: true})
// }
export function getJiaLouDetail1(id) {
return request.get('/countyFamous/sojourn/' + id, {}, {login: true})
}
// 旅居资讯数据
export function getJiaLouNews(params) {
@@ -153,7 +153,10 @@ export function postJiaLouNewsZan(data) {
export function postJiaLouShare(id) {
return request.get('/countyFamous/sojourn/poster/' + id, {login: true})
}
// 分享旅居1
export function postTravelShare(id) {
return request.get('/travel/poster/' + id, {login: true})
}
/**
* 获取旅居列表
* countyId int 县城ID
components/aiChat/entrance.vue
+3 -2
View File
@@ -24,7 +24,8 @@ export default {
data() {
return {
showImg: false,
settingInfo: {}
settingInfo: {},
localCityName: uni.getStorageSync('locationCityName') || ''
}
},
created() {
@@ -42,7 +43,7 @@ export default {
},
enterAiChat() {
uni.navigateTo({
url: '/aiChat/views/index?click=1&cityName=' + this.cityName
url: '/aiChat/views/index?click=1&cityName=' + (this.cityName || this.localCityName)
})
}
}
manifest.json
+1
View File
@@ -5,6 +5,7 @@
"versionName" : "4.0.0",
"versionCode" : 4,
"transformPx" : false,
"sassImplementationName" : "node-sass",
/* 5+App特有相关 */
"app-plus" : {
"usingComponents" : true,
pages.json
+8 -94
View File
@@ -22,12 +22,6 @@
"navigationBarTitleText": "登录"
}
},
{
"path": "pages/user/RetrievePassword/index",
"style": {
"navigationBarTitleText": "重置密码"
}
},
{
"path": "pages/home/index",
"style": {
@@ -51,7 +45,7 @@
{
"path": "pages/home/newZone",
"style": {
"navigationBarTitleText": "新品专区",
"navigationBarTitleText": "甄选好礼",
"navigationBarBackgroundColor": "#FFFFFF"
}
},
@@ -94,12 +88,6 @@
"navigationBarTitleText": "搜索"
}
},
{
"path": "pages/NotDefined/index",
"style": {
"navigationBarTitleText": "404"
}
},
{
"path": "pages/cloud/haveFun",
"style": {
@@ -140,18 +128,6 @@
"navigationBarTitleText": "商品评价"
}
},
{
"path": "pages/shop/GoodsPromotion/index",
"style": {
"navigationBarTitleText": "促销商品"
}
},
{
"path": "pages/shop/HotNewGoods/index",
"style": {
"navigationBarTitleText": "热门商品"
}
},
{
"path": "pages/shop/GoodsCon/index",
"style": {
@@ -185,43 +161,12 @@
"navigationBarTitleText": "收货地址"
}
},
{
"path": "pages/user/promotion/Poster/index",
"style": {
"navigationBarTitleText": "推广名片"
}
},
{
"path": "pages/user/signIn/Sign/index",
"style": {
"navigationBarTitleText": "签到"
}
},
{
"path": "pages/user/signIn/SignRecord/index",
"style": {
"navigationBarTitleText": "签到记录"
}
},
{
"path": "pages/user/promotion/CashAudit/index",
"style": {
"navigationBarTitleText": "提现结果"
}
},
{
"path": "pages/user/promotion/PromoterOrder/index",
"style": {
"navigationBarTitleText": "分销详情"
}
},
{
"path": "pages/user/promotion/PromoterList/index",
"style": {
"navigationBarTitleText": "分销列表",
"navigationBarBackgroundColor": "#FFFFFF"
}
},
{
"path": "pages/user/promotion/UserPromotion/index",
"style": {
@@ -255,12 +200,6 @@
"navigationBarTitleText": "我的积分"
}
},
{
"path": "pages/user/UserVip/index",
"style": {
"navigationBarTitleText": "用户vip"
}
},
{
"path": "pages/user/promotion/UserCash/index",
"style": {
@@ -343,13 +282,6 @@
"navigationBarBackgroundColor": "#FFFFFF"
}
},
{
"path": "pages/user/MemberUpgradeIntro/MemberUpgradeIntro",
"style": {
"navigationBarTitleText": "升级说明",
"navigationBarBackgroundColor": "#FFFFFF"
}
},
{
"path": "pages/VideoPlayBackList/VideoPlayBackList",
"style": {
@@ -364,31 +296,6 @@
"navigationBarBackgroundColor": "#FFFFFF"
}
},
{
"path": "pages/user/UpgradeElectronicProtocol/UpgradeElectronicProtocol",
"style": {
"navigationBarTitleText": "升级",
"navigationBarBackgroundColor": "#FFFFFF"
}
},
{
"path": "pages/user/UpgradeProtocolDetail/UpgradeProtocolDetail",
"style": {
"navigationBarTitleText": "共享股东协议"
}
},
{
"path": "pages/LiveAndShortVideo/LiveAndShortVideo",
"style": {
"navigationBarTitleText": "直播/视频"
}
},
{
"path": "pages/LiveBroadcastList/LiveBroadcastList",
"style": {
"navigationBarTitleText": "直播列表"
}
},
{
"path": "pages/user/UserFavorite/UserFavorite",
"style": {
@@ -726,6 +633,13 @@
"navigationStyle": "custom"
}
},
{
"path": "views/oldSojumStore",
"style": {
"navigationBarTitleText": "",
"navigationStyle": "custom"
}
},
{
"path": "views/housekeeperDetail",
"style": {
pages/home/index.vue
+120 -3
View File
@@ -45,6 +45,8 @@
autoplay
circular
style="height: 510rpx;"
:duration="500"
@animationfinish="bindSwiperInstance($event, 'banner')"
>
<block
v-for="(item, bannerIndex) in banner"
@@ -114,6 +116,8 @@
circular
autoplay
:interval="3000"
:duration="500"
@animationfinish="bindSwiperInstance($event, 'homestay')"
>
<swiper-item
v-for="(stay, stayIndex) in contentHomestay"
@@ -183,7 +187,24 @@
</swiper-item>
</swiper> -->
<view class="new-zone-wrap">
<view v-if="indexVideo" class="kd" id="xkd">
<image @click="toNewZone" class="bg-img" :src="newZone.indexBackgroundImage" mode="aspectFit|aspectFill|widthFix" lazy-load="false"></image>
<view class="swiper-wrap-zx v12-mt-2">
<swiper :autoplay="swiperInstances.newZone" @change="changeIndex" :current="currentIndex" next-margin="40rpx" previous-margin="80rpx" circular style="width: 100%;height: 400rpx;" interval="3000" :duration="500" @animationfinish="bindSwiperInstance($event, 'newZone')">
<swiper-item v-for="(item, index) in newZone.indexProducts" :key="index" class="s-item" :class="{'n-actived': currentIndex !== index}">
<view class="zx-item" @click="toNewZone">
<image :src="item.productImage" style="width: 192rpx; height: 192rpx; border-radius:10rpx"></image>
<view class="v12-pa-2">
<view class="v12-font-28 more-t v12-font-bold" style="text-align: center;">{{ item.productName }}</view>
<view class="v12-primary-text v12-font-bold price-wrap" style="text-align: center;">
<text class="v12-font-16">￥</text>
<text class="v12-font-24">{{ item.productPrice }}</text>
</view>
</view>
</view>
</swiper-item>
</swiper>
</view>
<!-- <view v-if="indexVideo" class="kd" id="xkd">
<view class="img-wrap" style="padding-top: 10rpx; box-sizing:border-box">
<image style="width: 112rpx; height:26rpx" :src="webUrl + '/orderIcon/kd.png'" mode="heightFix|widthFix"></image>
</view>
@@ -215,7 +236,7 @@
</swiper-item>
</swiper>
</view>
</view>
</view> -->
</view>
</view>
</view>
@@ -284,6 +305,8 @@
circular
autoplay
:interval="3000"
:duration="500"
@animationfinish="bindSwiperInstance($event, 'productSwiper')"
>
<swiper-item
v-for="(swiperItem, swiperIndex) in item.list"
@@ -312,6 +335,7 @@
<!-- v9 老用户弹窗 -->
<u-popup
v-if="isOldUserPopupShow"
mode="center"
bgColor="transparent"
:show="isOldUser && oldUserPopup.image && lotteryCanDraw"
@@ -381,6 +405,7 @@ import {
getLocationSetting,
openLocationSettting
} from "@/utils/common"
import { getWeixinShareConfig } from '@/api/public'
export default {
name: 'IndexPage',
components: {
@@ -393,6 +418,7 @@ export default {
mixins: [pageListenMixins, goCartMixin, GuideMixins],
data() {
return {
isOldUserPopupShow: 0,
webUrl: this.$VUE_APP_RESOURCES_URL,
// 状态栏高度
statusBarHeight: 20,
@@ -431,7 +457,17 @@ export default {
tabIconPostion: {},
messageIcon: {},
recommendKeyword: [],
keywordIndex: 0
keywordIndex: 0,
shareData: {},
currentIndex: 0,
// 轮播组件实例
swiperInstances: {
productSwiper: true,
homestay: true,
banner: true,
festival: true,
newZone: true,
}
}
},
onLoad() {
@@ -452,6 +488,15 @@ export default {
_this.statusBarHeight = statusBar
}
})
getWeixinShareConfig().then(res => {
const { success, data } = res
if (success) {
this.shareData = data
}
})
},
onShow() {
this.pageToShowHandle()
},
onHide() {
this.pageToHideHandle()
@@ -459,7 +504,46 @@ export default {
onPageScroll(e) {
this.scrollTop = e.scrollTop
},
onShareTimeline() {
uni.updateShareMenu({
isPrivateMessage: false,
withShareTicket: false
})
return {
title: this.shareData.title || this.share.title,
query: '',
imageUrl: this.shareData.image || this.share.imageUrl
}
},
methods: {
changeIndex(e) {
this.currentIndex = e.detail.current
},
// 页面显示时恢复轮播
pageToShowHandle() {
// 恢复所有轮播组件的自动播放
this.swiperInstances = {
productSwiper: true,
homestay: true,
banner: true,
festival: true,
newZone: true,
}
},
// 页面隐藏时暂停轮播
pageToHideHandle() {
this.swiperInstances = {
productSwiper: false,
homestay: false,
banner: false,
festival: false,
newZone: false,
}
},
// 绑定轮播组件实例
bindSwiperInstance(e, key) {
// this.swiperInstances[key] = e.detail
},
changeRecommendKeyword(e) {
this.keywordIndex = e
},
@@ -1345,6 +1429,7 @@ export default {
_this.$set(_this, 'contentHomestay', data.contentHomestayV2 || [])
_this.$set(_this, 'contentFestival', data.contentFestivalV2 || [])
_this.$set(_this, 'newZone', data.newGoods || [])
_this.$set(_this, 'isOldUserPopupShow', data.isOldUserPopupShow || 0)
_this.indexVideo = data.indexVideo ? data.indexVideo.videoUrl : ''
_this.bastLeftList = []
_this.bastRightList = []
@@ -1531,6 +1616,30 @@ export default {
</script>
<style scoped lang="less">
.n-actived{
// bottom: 20rpx !important;
.zx-item {
transform: scale(0.8);
}
}
.s-item{
height: fit-content !important;
bottom: 10rpx;
}
.zx-item{
width: 192rpx;
background: #fff;
border-radius: 16rpx;
transition: all 0.3s ease-in-out;
}
.swiper-wrap-zx{
position: absolute;
bottom: 20rpx;
z-index: 2;
/* height: 50%; */
width: 100%;
left: 0;
}
.swiper-item {
height: 100%;
}
@@ -1814,6 +1923,14 @@ export default {
display: flex;
flex-direction: column;
justify-content: space-between;
position: relative;
.bg-img{
height: 100%;
width: 100%;
position: absolute;
top: 0;
left: 0;
}
.kd{
width: 100%;
height: 266rpx;
pages/home/newZone.vue
+80 -7
View File
@@ -11,7 +11,7 @@
</swiper-item>
</swiper> -->
<view class="swiper-wrap">
<swiper @change="handleChange" style="height: 100%;" autoplay circular next-margin="460rpx" interval="4000">
<swiper @change="handleChange" style="height: 100%;" autoplay circular next-margin="460rpx" interval="4000">
<swiper-item v-for="(item, index) in details.newProducts" :key="index" @click="toGoods(item)">
<view class="new-card" :class="{'is-actived': current == index}">
<image :src="item.productCover" class="new-card-img" mode="heightFix|widthFix"></image>
@@ -29,8 +29,31 @@
</swiper>
</view>
</view>
<view class="v12-mt-2 v12-align-center">
<view class="v12-align-center tabs-wrap v1-py-1 v12-my-4">
<view class="tab-item v12-font-bold" v-for="(tab, index) in tabs" :key="index" @click="handleClick(index, tab)">
{{ tab.cateName }}
<view class="tab-line" v-if="activeIndex == index"></view>
</view>
</view>
<view class="product-wrap v12-mt-3">
<view class="product-card" v-for="(item, index) in products" :key="index" @click="toGoods(item)">
<image :src="item.productImage" class="product-card-img" mode="heightFix|widthFix"></image>
<view class="new-info">
<view class="v12-font-26 more-t" style="width: 100%;">{{ item.productName }}</view>
<view style="width: 100%;" class="v12-font-bold v12-primary-text v12-align-center v12-justify-between">
<view>
<text>￥</text>
<text class=" v12-font-36">{{ item.productPrice }}</text>
</view>
<view>
<u-icon :name="webUrl + '/home/icon-cart.png'" size="24"></u-icon>
</view>
</view>
</view>
</view>
</view>
<!-- <view class="v12-mt-2 v12-align-center">
<view class="primary-title" v-if="details.contentTitle">
{{ details.contentTitle }}
<view class="title-line"></view>
@@ -42,7 +65,7 @@
</view>
<view class="cover-img v12-mt-2" v-for="(item, index) in details.contents" :key="index" @click="toGoods(item)">
<image :src="item.contentImage" class="cover-img" mode="heightFix|widthFix"></image>
</view>
</view> -->
</view>
</template>
<script>
@@ -50,13 +73,19 @@ import { queryNewZone } from '@/api/activity'
export default{
data() {
return {
webUrl: this.$VUE_APP_RESOURCES_URL,
details: {},
current: 0,
tabs: [],
activeIndex: 0,
products: []
}
},
onLoad() {
queryNewZone().then(res => {
this.details = res.data
this.tabs = res.data.categories
this.handleClick(0, this.tabs[0])
})
},
computed: {
@@ -66,6 +95,10 @@ export default{
},
methods: {
handleClick(index, tab) {
this.activeIndex = index
this.products = tab.products
},
handleChange(e) {
this.current = e.detail.current
},
@@ -78,10 +111,50 @@ export default{
}
</script>
<style lang="scss" scoped>
.product-card{
width: 342rpx;
height: 520rpx;
background: #fff;
border-radius: 20rpx;
margin-bottom: 20rpx;
}
.product-card-img{
width: 344rpx;
height: 344rpx;
background: rgba(169,56,56,0.39);
border-radius: 20rpx;
}
.product-wrap{
display: flex;
justify-content: space-between;
flex-wrap: wrap;
}
.tab-line{
position: absolute;
bottom: 0;
left: 0;
width: 100%;
height: 6rpx;
background: linear-gradient(to right, #C52733 0%, rgba(202,56,67,0.92) 51%, rgba(255,255,255,0) 100%);
border-radius: 6rpx;
}
.tabs-wrap{
overflow: auto;
justify-content: space-between;
}
.tab-item{
margin-right: 20rpx;
white-space: nowrap;
position: relative;
&:last-child{
margin-right: 0;
}
}
.new-info{
display: flex;
align-items: center;
flex-direction: column;
padding: 20rpx;
}
.box-emp{
width: 100%;
@@ -92,7 +165,7 @@ export default{
width: fit-content;
color: #fff;
background: #C52733;
font-size: 28rpx;
font-size: 30rpx;
padding: 4rpx 20rpx;
}
.swiper-wrap{
@@ -104,7 +177,7 @@ export default{
}
.new-card{
width: 220rpx;
height: 240rpx;
// height: 240rpx;
background: #fff;
border-radius: 20rpx;
position: absolute;
@@ -160,7 +233,7 @@ export default{
}
.new-zone-page{
min-height: 100vh;
background-color: #fff;
// background-color: #fff;
padding: 20rpx;
}
.banner-zone{
pages/order/MyOrder/index.vue
+1 -1
View File
@@ -5,7 +5,7 @@
v-model="keyword"
:inputStyle="inputStyle"
:showAction="false"
placeholder="请输入商品名/订单号"
placeholder="请输入商品名/订单号/团购名称"
shape="round"
bgColor="#FFF"
@search="changeType"
pages/shop/GoodsCon/index.vue
+37
View File
@@ -688,6 +688,43 @@ export default {
}
})
},
onShareTimeline() {
uni.updateShareMenu({
isPrivateMessage: false,
withShareTicket: false
})
const storeName = this.storeInfo.storeName
const promise = new Promise(async (resolve, reject) => {
let result = null
let query = `id=${this.id}&partnerId=${this.userInfo.uid}`
if (this.source === 'famous') {
result = await famousGoodsShareImage(this.id)
}
if (this.source === 'kill') {
result = await secKillGoodsShareImage(this.activityId)
query += `&activityId=${this.activityId}`
}
if (result && result.status === 200) {
resolve({
title: storeName,
query,
imageUrl: result.data
})
} else {
resolve({
title: storeName,
query,
imageUrl: this.storeInfo.image
})
}
})
return {
title: storeName,
query: `id=${this.id}&partnerId=${this.userInfo.uid}`,
imageUrl: this.storeInfo.image,
promise
}
},
onLoad(options) {
// test data
console.log("getLaunchOptionsSync", uni.getLaunchOptionsSync())
pages_bak20251121.json
+1124
View File
File diff suppressed because it is too large Load Diff
pkg_product/mixins/themeMixins.js
+12
View File
@@ -44,6 +44,18 @@ export const themeMixins = {
}
}
},
onShareTimeline() {
uni.updateShareMenu({
isPrivateMessage: false,
withShareTicket: false
})
const title = this.pageData.forwardTitle || this.share.title
return {
title,
query: `id=${this.pageData.id}`,
imageUrl: this.pageData.forwardImage || this.share.imageUrl
}
},
methods: {
topImageClick() {
if (this.templateProperties.page1CouponEnable === 1 && this.templateProperties.page1CouponId) {
pkg_product/views/famousQianxianShop.vue
+21 -3
View File
@@ -499,7 +499,7 @@
</view>
<view class="info">
<view class="intro more-t">
{{ jiaLou.intro }}
{{ jiaLou.intro || '' }}
</view>
<view class="name-wrap">
<image
@@ -711,6 +711,7 @@
@ok="handleOk"
/>
<FunctionGuide @hide="setGuide('countyFamousIndex')" :maxStep="2" :guideData="functionGuideData" ref="FunctionGuide"></FunctionGuide>
<AiEntrance />
</view>
</template>
@@ -743,12 +744,14 @@ import cookie from '@/utils/store/cookie'
import { pageListenMixins } from '@/mixins/pageListenMixins'
import FunctionGuide from '@/components/FunctionGuide'
import GuideMixins from '@/mixins/GuideMixins'
import AiEntrance from '@/components/aiChat/entrance'
export default {
components: {
imgBox,
XddProductItem,
ProductWindow,
FunctionGuide
FunctionGuide,
AiEntrance
},
mixins: [pageListenMixins, goCartMixin, GuideMixins],
data() {
@@ -818,6 +821,17 @@ export default {
countyId: null,
}
},
onShareAppMessage() {
uni.updateShareMenu({
isPrivateMessage: false,
withShareTicket: false
})
return {
title: this.inn.countyName || this.share.title,
path: '/pkg_product/views/famousQianxianShop?id=' + this.id,
imageUrl: this.inn.cover || this.share.imageUrl
}
},
// 必须在页面加 onPageScroll(e){} ，才能滑动显示背景
onPageScroll(e) {
this.scrollData = e
@@ -1432,7 +1446,11 @@ export default {
uni.navigateTo({ url: `/pkg_product/views/famousQianxianTheme?id=${item.id}` })
},
sujoumeClickHandle(item) {
uni.navigateTo({ url: '/pkg_product/views/sojoumStore?id=' + item.id })
if(item.dataType === 'countyFamousSojourn') {
uni.navigateTo({ url: '/pkg_product/views/oldSojumStore?id=' + item.id })
return
}
uni.navigateTo({ url: '/pkg_product/views/sojoumStore?id=' + item.id })
},
industryTabItemClick(index) {
if (index === this.industryTabIndex) return
pkg_product/views/groupBuyDetails.vue
+28 -10
View File
@@ -102,6 +102,7 @@
duration="10000">
<swiper-item v-for="(img, idx) in c.images" :key="idx">
<image
@click="previewHero(c.images, img)"
:src="img"
class="swiper-img"
mode="aspectFill" />
@@ -151,7 +152,7 @@
<!-- 图片 -->
<view class="v12-mt-3 v12-px-3">
<view v-for="(img, idx) in detail.detailImages" :key="idx" >
<image :src="img" class="v12-radius-40" style="width: 100%;" mode="aspectFill" />
<image :src="img" class="v12-radius-40" style="width: 100%;" mode="aspectFill" @click="previewHero(detail.detailImages, img)" />
</view>
</view>
<view class="bottom-space"></view>
@@ -238,6 +239,11 @@ export default {
})
},
methods: {
previewHero(urls, current) {
console.log(urls);
uni.previewImage({ urls, current })
},
toGift(){
uni.navigateTo({
// + '&couponId=' + coupId
@@ -509,14 +515,27 @@ export default {
.val { color: #666; text-align: right; }
.gallery-img { width: 100%; margin-bottom: 16rpx; border-radius: 12rpx; overflow: hidden; }
.bottom-space { height: 140rpx; }
.bottom-bar { position: fixed; left: 0; right: 0; bottom: 0; background: #fff; border-top: 1rpx solid #eee; display: flex; align-items: center; justify-content: space-between; padding: 16rpx 24rpx; }
.total { font-size: 28rpx; color: #111; font-weight: 700; }
.bottom-bar {
position: fixed;
left: 0;
right: 0;
bottom: 0;
background: #fff;
border-top: 1rpx solid #eee;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 20rpx 20rpx 30rpx;
height: 140rpx;
box-sizing: border-box;
}
.total { font-size: 30rpx; color: #111; font-weight: 700; }
.bar-actions { display: flex; gap: 16rpx; }
.mini-btn {
padding: 10rpx 22rpx;
border: 1rpx solid #ccc;
border-radius: 132rpx;
font-size: 26rpx;
font-size: 30rpx;
color: #333;
display: flex;
align-items: center;
@@ -526,7 +545,7 @@ export default {
border-radius: 132rpx;
background: #C52733;
color: #fff;
font-size: 26rpx;
font-size: 30rpx;
display: flex;
align-items: center;
}
@@ -625,14 +644,13 @@ export default {
.val { color: #666; text-align: right; }
.gallery-img { width: 100%; margin-bottom: 16rpx; border-radius: 12rpx; overflow: hidden; }
.bottom-space { height: 140rpx; }
.bottom-bar { position: fixed; left: 0; right: 0; bottom: 0; background: #fff; border-top: 1rpx solid #eee; display: flex; align-items: center; justify-content: space-between; padding: 16rpx 24rpx; }
.total { font-size: 28rpx; color: #111; font-weight: 700; }
.total { font-size: 30rpx; color: #111; font-weight: 700; }
.bar-actions { display: flex; gap: 16rpx; }
.mini-btn {
padding: 10rpx 22rpx;
border: 1rpx solid #ccc;
border-radius: 132rpx;
font-size: 26rpx;
font-size: 30rpx;
color: #333;
display: flex;
align-items: center;
@@ -642,7 +660,7 @@ export default {
border-radius: 132rpx;
background: #C52733;
color: #fff;
font-size: 26rpx;
font-size: 30rpx;
display: flex;
align-items: center;
}
@@ -720,4 +738,4 @@ export default {
background: #CE4852;
}
}
</style>
</style>
pkg_product/views/healthList.vue
+3 -3
View File
@@ -113,7 +113,7 @@
<view
v-if="tabIndex === 0"
class="city-item"
@click="goStore(item.cityId, item.cityName)"
@click="goStore(item.id, item.cityName, item.cityId)"
>
<image
:src="item.icon"
@@ -364,9 +364,9 @@ export default {
this.label = label
this.searchReq()
},
goStore(id, name) {
goStore(id, name, cityId) {
uni.navigateTo({
url: '/pkg_product/views/healthSanctum?city=' + id +'&cityName=' + name
url: '/pkg_product/views/healthSanctum?city=' + id +'&cityName=' + name + '&goodCityId=' + cityId
})
},
goGoods(id) {
pkg_product/views/healthSanctum.vue
+19 -9
View File
@@ -43,8 +43,7 @@
<view class="v12-justify-between sanctup-items v12-mt-3">
<view v-for="(item, index) in items" :key="index" class="v12-pa-1" @click="toStore(item)">
<view class="img">
<image class="img" :src="item.cover"></image>
<!-- <video
<video
class="img"
:src="item.cover"
:play-btn-position="center"
@@ -52,8 +51,10 @@
:show-center-play-btn="flase"
:show-play-btn="false"
:controls="false"
:poster="item.cover + '?vframe/jpg/offset/1'"
v-if="item.coverType === 2">
</video> -->
</video>
<image v-else class="img" :src="item.cover"></image>
<view class="v12-white-text address">
<image
class="map-icon v12-mr-1"
@@ -62,7 +63,7 @@
<text class="v12-font-28">{{ item.areaName }}</text>
</view>
</view>
<view class="v12-font-bold v12-font-28 v12-mt-1 more-t desc-txt">{{ item.intro }}</view>
<view v-if="item.intro" class="v12-font-bold v12-font-28 v12-mt-1 more-t desc-txt">{{ item.intro }}</view>
<view class="v12-justify-start v12-align-center v12-my-1">
<view class="atr">
<image class="atr" :src="item.avatar"></image>
@@ -126,9 +127,9 @@ export default {
getList() {
const params = {
// countyId: this.cityId,
cityId: this.cityId,
goodCityId: this.cityId,
wellnessPlaceCateId : this.categoryId,
shopType: 'wellness',
shopType: 'wellnessCate',
page: 1,
limit: 9999
}
@@ -144,8 +145,8 @@ export default {
},
getTop() {
const params = {
cityId: this.cityId,
shopType: 'wellness',
goodCityId: this.cityId,
shopType: 'wellnessTop',
page: 1,
limit: 9999
}
@@ -155,7 +156,16 @@ export default {
})
},
toStore(item) {
uni.navigateTo({ url: '/pkg_product/views/sojoumStore?id=' + item.id })
if(item.dataType === 'wellnessPlace'){
this.$yrouter.push({
path: '/pagesInn/inn/innHome',
query: {
id: item.hotelId
}
})
}else{
uni.navigateTo({ url: '/pkg_product/views/sojoumStore?id=' + item.id })
}
},
}
}
pkg_product/views/healthSearch.vue
+18 -13
View File
@@ -5,7 +5,7 @@
</view>
<view v-if="isSearch" class="search-res-wrap">
<view class="v12-justify-between sanctup-items v12-mt-3">
<view v-for="(item, index) in items" :key="index" class="v12-pa-1" @click="toStore(item.hotelId)">
<view v-for="(item, index) in items" :key="index" class="v12-pa-1" @click="toStore(item)">
<view class="img">
<image class="img" :src="item.cover" v-if="item.coverType === 1"></image>
<video
@@ -25,12 +25,12 @@
<text class="v12-font-28">{{ item.areaName }}</text>
</view>
</view>
<view class="v12-font-bold v12-font-28 v12-mt-1 more-t desc-txt">{{ item.content }}</view>
<view class="v12-font-bold v12-font-28 v12-mt-1 more-t desc-txt">{{ item.intro }}</view>
<view class="v12-justify-start v12-align-center v12-my-1">
<view class="atr">
<image class="atr" :src="item.logo"></image>
<image class="atr" :src="item.avatar"></image>
</view>
<view class="v12-font-26 v12-ml-2 v12-dark-text one-t">{{ item.hotelName }}</view>
<view class="v12-font-26 v12-ml-2 v12-dark-text one-t">{{ item.name }}</view>
</view>
</view>
</view>
@@ -45,6 +45,7 @@
<script>
import { getCategory,getWellnessPlace } from '@/api/health'
import { getJiaLouList } from '@/api/qianxian'
export default {
data() {
return {
@@ -63,23 +64,27 @@ export default {
const params = {
goodCityId: this.goodCityId,
categoryId: '',
keyword: this.keyword,
name: this.keyword.trim(),
page: 1,
limit: 9999
}
getWellnessPlace(params).then(res => {
getJiaLouList(params).then(res => {
this.items = res.data.records
}).finally(() => {
this.isSearch = true
})
},
toStore(id) {
this.$yrouter.push({
path: '/pagesInn/inn/innHome',
query: {
id: id
}
})
toStore(item) {
if(item.dataType === 'wellnessPlace'){
this.$yrouter.push({
path: '/pagesInn/inn/innHome',
query: {
id: item.hotelId
}
})
}else{
uni.navigateTo({ url: '/pkg_product/views/sojoumStore?id=' + item.id })
}
},
}
}
pkg_product/views/heritage.vue
+2
View File
@@ -196,8 +196,10 @@ export default {
}
.img-item {
display: block;
width: 160rpx;
height: 160rpx;
transform: scale(1.33);
}
}
}
pkg_product/views/heritage/index.vue
+5
View File
@@ -87,12 +87,17 @@
class="img-nodata"
/>
</view>
<AiEntrance />
</view>
</template>
<script>
import { getIch, getIchRecommend } from '@/api/heritage'
import AiEntrance from '@/components/aiChat/entrance'
export default {
components: {
AiEntrance
},
data() {
return {
webUrl: this.$VUE_APP_RESOURCES_URL,
pkg_product/views/housekeeperDetail.vue
+2 -2
View File
@@ -42,8 +42,8 @@
{{ record.intro }}
</view>
</view>
<view class="v12-mt-3 v12-align-center">
<view v-for="tag in record.tags" :key="tag" class="v12-primary-text v12-primary-border v12-radius-100 tag-item v12-mr-2">{{ tag }}</view>
<view class="v12-mt-3 v12-align-center" style="flex-wrap: wrap;">
<view v-for="tag in record.tags" :key="tag" class="v12-primary-text v12-primary-border v12-radius-100 tag-item v12-mr-2 v12-mb-2">{{ tag }}</view>
</view>
<view class="v12-mt-2 v12-font-24" style="color: #666">
{{ record.desc }}
pkg_product/views/oldSojumStore.vue
+1103
View File
File diff suppressed because it is too large Load Diff
pkg_product/views/sojoumOrderDetails.vue
+12 -3
View File
@@ -45,7 +45,16 @@
</view>
</view>
</view>
<view class="order-section">
<view class="info-item">
<text class="label">团购总价</text>
<text class="value">￥{{orderInfo.travelGroupOrderInfo.travelGroupProduct.price}}</text>
</view>
<view class="info-item" style="margin-bottom: 0rpx;">
<text class="label">满减优惠</text>
<text class="value">￥{{orderInfo.couponPrice}}</text>
</view>
</view>
<!-- 核销码 -->
<view class="verify-section" v-if="orderInfo._status && ['1','2'].includes(orderInfo._status._type)">
<view class="verify-title v12-font-28 v12-primary-text">核销码：{{orderInfo.verifyCode}}</view>
@@ -271,8 +280,8 @@ export default {
})
this.getSojoumOrderDetail();
}
}).finally(() => {
uni.hideLoading();
}).finally(() => {
})
},
getMonthDay() {
@@ -557,7 +566,7 @@ export default {
left: 0;
right: 0;
background-color: #fff;
padding: 20rpx 30rpx;
padding: 26rpx 30rpx;
display: flex;
justify-content: space-between;
box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.05);
pkg_product/views/sojoumStore.vue
+3 -3
View File
@@ -303,7 +303,7 @@
<image :src="webUrl + '/home/管家角标.png'" class="star-icon" />
</view>
<view class="desc more-t v12-font-bold">
{{ item.desc }}
{{ item.intro }}
</view>
<view class="tag-list">
<view v-for="(tag, i) in item.tags" :key="i" class="tag">{{ tag }}</view>
@@ -350,7 +350,7 @@ import {
postJiaLouNewsView,
postJiaLouNewsZan,
postJiaLouZan,
postJiaLouShare,
postTravelShare,
getJiaLouProductList,
getJiaLouStewardList,
getJiaLouNewsList
@@ -540,7 +540,7 @@ export default {
},
changeShare() {
uni.showLoading()
postJiaLouShare(this.id).then(res => {
postTravelShare(this.id).then(res => {
this.posterUrl = res.data
this.showShare = !this.showShare
}).finally(() => {
pkg_product/views/submitOrder.vue
+17 -4
View File
@@ -434,15 +434,28 @@ export default {
.text-card .plain-text { font-size: 26rpx; color: #666; line-height: 40rpx; letter-spacing: 2px;}
.bottom-space { height: 140rpx; }
.bottom-bar { position: fixed; left: 0; right: 0; bottom: 0; background: #fff; border-top: 1rpx solid #eee; display: flex; align-items: center; justify-content: space-between; padding: 16rpx 24rpx; }
.total { font-size: 28rpx; color: #111; font-weight: 700; }
.bottom-bar {
position: fixed;
left: 0;
right: 0;
bottom: 0;
background: #fff;
border-top: 1rpx solid #eee;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 20rpx 20rpx 30rpx;
height: 140rpx;
box-sizing: border-box;
}
.total { font-size: 30rpx; color: #111; font-weight: 700; }
.total .highlight { color: #C52733; font-weight: 700; }
.bar-actions { display: flex; gap: 16rpx; }
.mini-btn {
padding: 10rpx 22rpx;
border: 1rpx solid #ccc;
border-radius: 32rpx;
font-size: 26rpx;
font-size: 30rpx;
color: #333;
display: flex;
align-items: center;
@@ -452,7 +465,7 @@ export default {
border-radius: 32rpx;
background: #C52733;
color: #fff;
font-size: 26rpx;
font-size: 30rpx;
display: flex;
align-items: center;
}
pkg_user/views/gift/components/CoverPicker.vue
+34 -18
View File
@@ -3,34 +3,33 @@
:show="show"
mode="bottom"
round="40rpx"
@close="close"
:customStyle="{height: '600rpx'}"
closeable>
<view class="cover-picker">
<view class="cover-title">选择封面</view>
@close="close"
>
<view class="cover-picker v12-pt-4">
<swiper
:current="currentIndex"
:autoplay="false"
:circular="true"
:indicator-dots="false"
@change="onChange"
previous-margin="200rpx"
previous-margin="180rpx"
next-margin="180rpx"
class="cover-swiper"
>
<swiper-item v-for="(item, index) in list" :key="index">
<swiper-item v-for="(item, i) in list" :key="i" class="cover-swiper-item" :class="{'n-actived' : currentIndex !== i}">
<view class="cover-item" >
<view class="img-wrap" :class="currentIndex === index ? 'v12-mt-10' : 'v12-mt-18'">
<view class="img-wrap">
<view class="pro-img-wrap " :style="{
left: (item.productImageX*2 || 0) + 'rpx',
top: (item.productImageY*2 || -40) + 'rpx'
}">
<image :src="product.image" class="pro-cover-image" mode="widthFix|heightFix" />
</view>
<image :src="item.cover" class="cover-image" mode="widthFix|heightFix" />
<view class="message-text" :style="{top: currentIndex !== index ? '260rpx' : '220rpx'}">{{ message }}</view>
<image :src="item.cover" class="cover-image" mode="widthFix" />
<!-- <view class="message-text" :style="{top: currentIndex !== index ? '260rpx' : '220rpx'}">{{ message }}</view> -->
</view>
<view class="cover-name">{{ item.name }} </view>
<!-- <view class="cover-name">{{ item.name }} </view> -->
</view>
</swiper-item>
</swiper>
@@ -80,10 +79,12 @@ export default {
},
methods: {
close() {
this.currentIndex = 0
this.$emit('update:show', false)
},
onChange(e) {
this.currentIndex = e.detail.current
this.$forceUpdate()
},
confirm() {
this.$emit('confirm', this.list[this.currentIndex])
@@ -94,6 +95,18 @@ export default {
</script>
<style lang="less" scoped>
.n-actived{
.cover-item{
transform: scale(0.8);
margin-bottom: -70rpx !important;
}
}
.cover-swiper-item{
height: fit-content !important;
bottom: 0;
overflow: visible;
}
.message-text{
position: absolute;
text-align: center;
@@ -105,24 +118,24 @@ export default {
margin: auto;
}
.pro-cover-image{
width: 218rpx;
height: 218rpx;
width: 320rpx;
height: 320rpx;
border-radius: 16rpx;
}
.pro-img-wrap{
position: absolute;
width: 218rpx;
height: 218rpx;
width: 320rpx;
height: 320rpx;
left: 0;
right: 0;
margin: auto;
/*border: 10rpx solid #FDF0D3;*/
top: -40px;
border-radius: 16rpx;
overflow: hidden;
}
.img-wrap{
position: relative;
transition: all .2s ease-in-out;
overflow: visible;
}
.tips{
font-size: 24rpx;
@@ -146,9 +159,12 @@ export default {
display: flex;
flex-direction: column;
align-items: center;
overflow: visible;
transition: all .3s ease-in-out;
margin-bottom: 30rpx;
.cover-image {
width: 340rpx;
height: 560rpx;
width: 420rpx;
// height: 580rpx;
border-radius: 16rpx;
transition: all .2s ease-in-out;
}
pkg_user/views/gift/components/GiftCard.vue
+16 -14
View File
@@ -1,10 +1,10 @@
<template>
<view class="dialog-conent" v-show="isLogin">
<view class="gift-card-modal" >
<image class="bg-image" :src="!card.isBlind ? card.cover : card.blindBoxImage" mode="aspectFit|aspectFill|widthFix" lazy-load="false"></image>
<image class="bg-image" :src="!card.isBlind ? card.cover : card.blindBoxImage" mode="widthFix" lazy-load="false"></image>
<view v-if="card.isBlind !== 1" class="image-wrap" :style="{
top: card.productImageY*2 + 'rpx',
left: card.productImageX*2 + 'rpx'
left: card.productImageX*2+ 'rpx'
}">
<image v-if="!isTravelGroup" class="pro-image" :src="card.giftProducts[0].productImage" mode="aspectFit|aspectFill|widthFix" lazy-load="false">
@@ -35,19 +35,19 @@
<u-icon :name="webUrl + '/icon/share.png'" ></u-icon>
</button>
</view>
<view v-if="myGift.isCurrentUser === 1 && !card.isBlind" @click="toOrder" style="z-index: 10; display: flex;flex-direction: column;align-items: center;">
<view v-if="myGift.isCurrentUser === 1 && !card.isBlind" @click="toOrder" style="z-index: 10; display: flex;flex-direction: column;align-items: center;margin-top:200rpx;">
<view class="address-btn v12-white-text v12-primary">
您已领取礼包
</view>
<view class="info-btn v12-text-center v12-font-32 v12-mt-3">查看礼包详情>></view>
</view>
<view v-if="myGift.isCurrentUser === 1 && card.isBlind" style="z-index: 10; display: flex;flex-direction: column;align-items: center;">
<view v-if="myGift.isCurrentUser === 1 && card.isBlind" style="z-index: 10; display: flex;flex-direction: column;align-items: center;margin-top:200rpx;">
<view style="width: fit-content;" class="address-btn v12-white-text v12-primary" @click="toOrder">
您已领取礼包，去看看>>
</view>
<view class="info-btn v12-text-center v12-font-32 v12-mt-3" @click.stop="searchGift">我也要送礼</view>
</view>
<view v-if="isReceive && myGift.isCurrentUser !== 1" @click="toHome" style="z-index: 10; display: flex;flex-direction: column;align-items: center;">
<view v-if="isReceive && myGift.isCurrentUser !== 1" @click="toHome" style="z-index: 10; display: flex;flex-direction: column;align-items: center;margin-top:200rpx;">
<view class="address-btn v12-white-text v12-primary">
礼包已被领取
</view>
@@ -64,13 +64,13 @@
<u-icon :name="webUrl + '/icon/share.png'" ></u-icon>
</button>
</view>
<view v-if="card.isOverReceive === 1" @click="toHome" style="z-index: 10; display: flex;flex-direction: column;align-items: center;">
<view v-if="card.isOverReceive === 1" @click="toHome" style="z-index: 10; display: flex;flex-direction: column;align-items: center;margin-top:200rpx;">
<view class="address-btn v12-white-text v12-primary">
礼包已被领取
</view>
<view class="info-btn v12-text-center v12-font-32 v12-mt-3" style="z-index: 10">去商城看看>></view>
</view>
<view v-if="card.isUserReceive === 1 && card.isOverReceive === 0" style="z-index: 10; display: flex;flex-direction: column;align-items: center;">
<view v-if="card.isUserReceive === 1 && card.isOverReceive === 0" style="z-index: 10; display: flex;flex-direction: column;align-items: center;margin-top:200rpx;">
<view style="width: fit-content;" class="address-btn v12-white-text v12-primary" @click="toOrder">
您已领取礼包，去看看>>
</view>
@@ -326,10 +326,11 @@ export default {
display: flex;
justify-content: center;
align-content: center;
margin-top: 200rpx;
}
.bg-image{
width: 340rpx;
height: 560rpx;
width: 420rpx;
/* height: 560rpx; */
position: absolute;
border-radius: 16rpx;
top: 0;
@@ -360,8 +361,8 @@ export default {
height: 296rpx;
}
.image-wrap{
width: 218rpx;
height: 218rpx;
width: 320rpx;
height: 320rpx;
/*border: 10rpx solid #FDF0D3;*/
border-radius: 16rpx;
position: absolute;
@@ -371,8 +372,9 @@ export default {
margin: auto;
}
.pro-image{
width: 218rpx;
height: 218rpx;
width: 320rpx;
height: 320rpx;
border-radius: 16rpx;
/* border-radius: 30rpx; */
}
.auto-text-color {
@@ -417,7 +419,7 @@ export default {
}
.gift-card-modal {
height: 560rpx;
width: 340rpx;
width: 420rpx;
justify-content: center;
z-index: 999;
/* margin-top: 100rpx; */
pkg_user/views/gift/gift.vue
+50 -32
View File
@@ -1,23 +1,8 @@
<template>
<view class="gift-page" v-if="(goodsInfo.productInfo && goodsInfo.productInfo.storeName) || isGroupBuy">
<view class="top-card" v-if="!isPayOk ">
<view class="v12-justify-between v12-pa-2">
<view>
<view></view>
<view class="v12-font-28 v12-secondary-dark-text v12-d-flex">
<u-icon :name="webUrl + '/icon/gift-primary.png'"></u-icon>
<!-- 送礼寄语 -->
</view>
</view>
<view class="v12-primary-text v12-font-26 v12-d-flex v12-align-center">
<image class="custom-cover" :src="webUrl + '/icon/custom.png'" mode="heightFix" lazy-load="false">
</image>
<view @click="handleShowCover">{{ cover }}封面</view>
<view>
<u-icon name="arrow-right" color="#c52733"></u-icon>
</view>
</view>
<view class="v12-justify-between" @click="handleShowCover">
<image class="popCover" :src="popupCover" mode="widthFix" lazy-load="false"></image>
</view>
</view>
<view class="gift-good-card">
@@ -96,7 +81,7 @@
<text class="v12-dark-text v12-font-30">{{ isGroupBuy ? goodsInfo.price : computedResult.totalPrice }}</text>
</view>
</view>
<view class="v12-justify-between v12-align-center v12-font-28 v12-mt-1" v-if="!isGroupBuy">
<view class="v12-justify-between v12-align-center v12-font-28 v12-mt-1">
<view class="v12-font-24 v12-dark-text">平台折扣：</view>
<view>
-
@@ -104,7 +89,7 @@
<text class="v12-dark-text v12-font-30">{{ computedResult.discountPrice }}</text>
</view>
</view>
<view class="v12-justify-between v12-align-center v12-font-28 v12-mt-1" v-if="!isGroupBuy">
<view class="v12-justify-between v12-align-center v12-font-28 v12-mt-1">
<view class="v12-font-24 v12-dark-text v12-align-center">
<view class="">
优惠券：
@@ -126,7 +111,7 @@
<view class="v12-font-bold">合计：</view>
<view class="">
<text class="v12-primary-text v12-font-bold v12-font-22">￥</text>
<text class="v12-primary-text v12-font-bold v12-font-28">{{ isGroupBuy ? goodsInfo.price : computedResult.payPrice }}</text>
<text class="v12-primary-text v12-font-bold v12-font-28">{{ computedResult.payPrice }}</text>
</view>
</view>
</view>
@@ -161,7 +146,7 @@
ref='payPwdPop'
showMoney
v-if="isShowPayPwdPop"
:money="isGroupBuy ? goodsInfo.price : payPrice"
:money="payPrice"
:show="isShowPayPwdPop"
@close="isShowPayPwdPop = false"
@finish="pwdPopFinish"
@@ -200,7 +185,9 @@ import {
getGiftCardSendOrderAmount,
getGiftCardResend,
createGroupBuyGift,
createSojoumGroupBuyGift
createSojoumGroupBuyGift,
fetchSojoumGroupBuyGiftCarousel,
computedSojoumGroupBuyGiftOrderPrice
} from '@/api/gift'
import { weappPay } from "@/libs/wechat";
import {mapGetters} from "vuex";
@@ -256,13 +243,18 @@ export default {
showPopup: false,
blindImage: '',
isGroupBuy: false,
popupCover: ''
}
},
watch: {
async couponId(value) {
this.couponIndex = this.couponList['usable']?.findIndex(item => item.id === +value)
this.couponTitle = this.couponList['usable']?.[this.couponIndex]?.couponTitle
await this.computedPrice(this.goodsInfo.cartNum, 1)
if(this.isGroupBuy) {
await this.computedTravelGroupPrice(false)
} else {
await this.computedPrice(this.goodsInfo.cartNum, 1)
}
}
},
onLoad(opts) {
@@ -275,6 +267,9 @@ export default {
} else {
this.getGift()
}
fetchSojoumGroupBuyGiftCarousel().then(res => {
this.popupCover = res.data[0]
})
},
computed: {
...mapGetters(["userInfo"]),
@@ -294,14 +289,23 @@ export default {
imageUrl: this.shareImage
}
},
// onReady() {
// this.$nextTick(() => {
// this.$refs.textarea.setFormatter(val => {
// return val.length > 30 ? val.substring(0, 30) : val
// })
// })
// },
methods: {
// 团购价计算
computedTravelGroupPrice(useDefaultCouponId) {
const params = {
key: this.orderKey,
couponId: this.couponId
}
computedSojoumGroupBuyGiftOrderPrice(params).then(res => {
this.computedResult = res.data.result
this.couponList = res.data.result.couponList
this.payPrice = res.data.result.payPrice
this.$forceUpdate()
if(useDefaultCouponId) {
this.couponId = res.data.result.defaultCouponId || 0
}
})
},
handleShowCover() {
this.showCoverPicker = true
},
@@ -320,12 +324,20 @@ export default {
if(!item.id) {
this.couponId = 0
this.couponTitle = ''
this.computedPrice(this.goodsInfo.cartNum, 1)
if(this.isGroupBuy) {
this.computedTravelGroupPrice(false)
} else {
this.computedPrice(this.goodsInfo.cartNum, 1)
}
return
}
this.couponId = item.id
this.couponTitle = item.couponTitle
this.computedPrice(this.goodsInfo.cartNum, 1)
if(this.isGroupBuy) {
this.computedTravelGroupPrice(false)
} else {
this.computedPrice(this.goodsInfo.cartNum, 1)
}
},
makeAgain() {
const params = {
@@ -462,6 +474,7 @@ export default {
message : this.message || '礼笺轻启，礼藏心意',
canTransfer: this.canTransfer ? 1 : 0,
passwordPay: this.payPassword || '',
couponId: this.couponId,
payType: this.payType,
} : {
orderKey: this.orderKey,
@@ -586,6 +599,7 @@ export default {
}
}
this.giftNotice = res.data.giftCardGiftNotice
this.computedTravelGroupPrice(true)
}
})
}
@@ -734,4 +748,8 @@ export default {
background: #fff;
border-radius: 30rpx;
}
.popCover{
width: 100%;
border-radius: 16rpx;
}
</style>
pkg_user/views/giftList.vue
+1 -5
View File
@@ -33,7 +33,6 @@
<image
:src="cart.productInfo.image"
class="img"
mode="widthFix"
/>
</view>
<view class="gift-good-info">
@@ -56,7 +55,6 @@
<image
:src="item.giftInfoTravelGroup.travelGroupProductInfo.mainImage"
class="img"
mode="widthFix"
/>
</view>
<view class="gift-good-info">
@@ -65,7 +63,7 @@
</view>
<view class="price-wrap">
<view class="price">
<text class="prefix">￥</text>{{ item.giftInfoTravelGroup.travelGroupProductInfo.price }}
<text class="prefix">￥</text>{{ item.payPrice }}
</view>
<view class="num">已领取{{item.giftInfoTravelGroup.receiveNum}}/{{ item.giftInfoTravelGroup.totalNum }}</view>
</view>
@@ -147,7 +145,6 @@
<image
:src="cart.productInfo.image"
class="img"
mode="widthFix"
/>
</view>
<view class="gift-good-info">
@@ -178,7 +175,6 @@
<image
:src="item.travelGroupProductInfo.mainImage"
class="img"
mode="widthFix"
/>
</view>
<view class="gift-good-info">
utils/index.js
+2 -2
View File
@@ -1214,18 +1214,18 @@ export function uploadVideo(videoPath, callback) {
name: "file",
success: res => {
if (callback) {
uni.hideLoading()
callback(JSON.parse(res.data).link)
}
},
fail: err => {
uni.showToast({
title: "上传视频失败" + err,
title: "视频大小不能超过500MB",
icon: "none",
duration: 2000
});
},
complete: res => {
uni.hideLoading()
}
});
}