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

Feat(时令尝鲜):接口对接

Browse Source
This commit is contained in:
lifizer
2023-09-23 18:13:26 +08:00
parent c9ceac9f37
commit 2d73c2fe46
35 changed files with 2834 additions and 1547 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/Loading/index.vue
+99 -128
View File
@@ -1,144 +1,115 @@
<template>
<view class="lottie-bg">
<img class="start-img" :src="webUrl+'/20220929145109969605.png'" mode="scaleToFill">
</view>
<view class="lottie-bg" :style="{ backgroundImage: 'url(' + splashScreen + ')' }"/>
</template>
<script>
import {
mapState,
mapMutations,
mapActions
} from "vuex";
import {
wxappAuth,
getUser,
userBindParent
} from "@/api/user";
import dayjs from "dayjs";
import cookie from "@/utils/store/cookie";
import {
parseQuery,
login,
handleQrCode,
getCurrentPageUrl,
handleUrlParam,
checkAuth
} from "@/utils";
import {mapActions} from "vuex";
import {userBindParent} from "@/api/user";
import cookie from "@/utils/store/cookie";
import {checkAuth, getCurrentPageUrl, handleQrCode, handleUrlParam, login} from "@/utils";
import {getSplashScreen} from "@/api/public";
export default {
name: "Loading",
data() {
return {
webUrl: this.$VUE_APP_RESOURCES_URL,
staticUrl: this.$STATIC_RESOURCE_URL
};
},
onShow() {
var url = handleQrCode();
if (!url) {
url = handleUrlParam(getCurrentPageUrl())
}
// 判断是否是分销
if (url) {
var spread = cookie.get("spread");
let urlSpread = parseInt(url.spread);
// if (!Number.isNaN(urlSpread) && spread !== urlSpread) {
if (!Number.isNaN(urlSpread)) {
cookie.set("spread", urlSpread || 0);
export default {
name: "Loading",
data() {
return {
splashScreen: ""
};
},
onLoad() {
getSplashScreen().then(({data}) => this.splashScreen = data);
},
onShow() {
let url = handleQrCode();
if (!url) {
url = handleUrlParam(getCurrentPageUrl())
}
// 判断是否是分销
if (url) {
let spread = cookie.get("spread");
let urlSpread = parseInt(url.spread);
if (!Number.isNaN(urlSpread)) {
cookie.set("spread", urlSpread || 0);
//绑定上级
userBindParent({
spread: urlSpread
}).finally(() => {
this.$yrouter.switchTab({
path: "/pages/home/index"
});
})
return;
// //如果是分销强制跳转到授权界面,来绑定关系
// var path = "/pages/authorization/index";
// this.$yrouter.reLaunch({path:path});
// cookie.set('redirect', path)
// return;
} else if (spread === 0 || typeof spread !== "number") {
cookie.set("spread", urlSpread || 0);
}
}
if (this.$store.getters.token) {
// 注释下面一行，会停留在启动页
setTimeout(() => {
this.toLaunch();
}, 2000)
return;
}
cookie.get("spread");
// this.toLaunch();
if (this.$deviceType == "app") {
// this.toLaunch();
this.$yrouter.switchTab({
path: "/pages/home/index"
});
return;
}
//检查授权信息
this.checkUserInfo();
},
methods: {
...mapActions(["changeAuthorization", "setUserInfo"]),
toLaunch() {
this.changeAuthorization(false);
this.$yrouter.switchTab({
path: "/pages/home/index"
});
},
checkUserInfo: async function() {
//检查是否有授权信息
var loginInfo = null;
let authUserInfo = await checkAuth().catch(err => {});
console.log('authUserInfo:' + JSON.stringify(authUserInfo));
if (authUserInfo) {
loginInfo = {
userInfo: authUserInfo,
iv: '',
encryptedData: ''
}
}
login(loginInfo).finally(() => {
//绑定上级
userBindParent({
spread: urlSpread
}).finally(() => {
this.$yrouter.switchTab({
path: "/pages/home/index"
});
});
})
return;
} else if (spread === 0 || typeof spread !== "number") {
cookie.set("spread", urlSpread || 0);
}
}
};
if (this.$store.getters.token) {
// 注释下面一行，会停留在启动页
setTimeout(() => {
this.toLaunch();
}, 2000)
return;
}
cookie.get("spread");
// this.toLaunch();
if (this.$deviceType == "app") {
// this.toLaunch();
this.$yrouter.switchTab({
path: "/pages/home/index"
});
return;
}
//检查授权信息
this.checkUserInfo();
},
methods: {
...mapActions(["changeAuthorization", "setUserInfo"]),
toLaunch() {
this.changeAuthorization(false);
this.$yrouter.switchTab({
path: "/pages/home/index"
});
},
checkUserInfo: async function () {
//检查是否有授权信息
let loginInfo = null;
let authUserInfo = await checkAuth().catch(err => {
});
console.log('authUserInfo:' + JSON.stringify(authUserInfo));
if (authUserInfo) {
loginInfo = {
userInfo: authUserInfo,
iv: '',
encryptedData: ''
}
}
login(loginInfo).finally(() => {
this.$yrouter.switchTab({
path: "/pages/home/index"
});
});
}
}
};
</script>
<style scoped lang="less">
.lottie-bg {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
background-color: #C9151E;
}
.start-img {
position: fixed;
bottom: 200rpx;
left: 50%;
transform: translate(-50%, 0);
width: 190rpx;
height: 212rpx;
}
.lottie-bg {
position: fixed;
left: 0;
top: 0;
width: 100vw;
height: 100vh;
background-repeat: no-repeat;
background-size: 100vw 100vh;
overflow: hidden;
}
</style>
pages/authorization/index.vue
+11 -3
View File
@@ -30,7 +30,7 @@
<image class="btn-close" :src="webUrl+'/20221230200935413332.png'" @click="show=false"/>
<view class="content">
<view class="title tc bold">《用户协议及隐私政策》</view>
<view class="popup-content" v-html="agreeInfo.privacyPolicy"></view>
<rich-text :nodes="agreeInfo.privacyPolicy"/>
<view class="title tc">
<button size="mini" @click="show=false">关闭</button>
</view>
@@ -41,7 +41,7 @@
<view class="dialog-mask" v-if="showFillOut">
<view class="dialog-fill flex flex-col ai-center">
<view class="title bold">请完善您的头像和昵称</view>
<button class="avatar-wrapper" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
<button class="avatar-wrapper" open-type="chooseAvatar" bindchooseavatar="onChooseAvatar">
<image class="avatar" :src="avatarUrl"></image>
</button>
<input type="nickname" class="input-wrapper" placeholder="请输入昵称" @input="inputName" @confirm="inputName"
@@ -207,7 +207,15 @@ export default {
avatar: this.avatarUrl
}
postUserEdit(param).then(res => {
this.doneRedirect()
if (res.status === 200) {
this.doneRedirect();
} else {
uni.showToast({
title: res.msg,
icon: "none",
duration: 5000
})
}
}).catch(error => {
uni.showToast({
title: error,
pages/cloud/haveFun.vue
+3 -40
View File
@@ -18,6 +18,7 @@ export default {
this.getMapData();
getHotelTypeList().then(({data}) => {
this.typeList = data;
console.log("getHotelTypeList")
this.search();
});
},
@@ -27,6 +28,7 @@ export default {
if (memCityName.length) {
this.cityName = memCityName;
uni.removeStorageSync("cityName")
console.log("memCityName if")
this.search();
}
},
@@ -56,45 +58,6 @@ export default {
}
},
// getCurAddress() {
// let that = this;
// //定位
// uni.showLoading({
// title: '定位中...'
// });
//
// uni.getLocation({
// type: 'wgs84',
// success: function (res) {
// let latitude = res.latitude;
// let longitude = res.longitude;
//
// // #ifndef H5
// uni.request({
// url: 'https://apis.map.qq.com/ws/geocoder/v1/?location=' + latitude + ',' + longitude +
// '&key=' + config.key,
// success: function (res) {
// uni.hideLoading();
//
// that.cityName = res.data.result.ad_info.city;
// //定位成功刷新数据
// that.search()
// },
// fail: function () {
// uni.hideLoading();
// },
// complete: function () {
// }
// });
// // #endif
// },
// fail: function (err) {
// console.log("test",err)
// uni.hideLoading();
// }
// });
// },
tapType(index) {
if (this.typeIndex === index) return;
this.typeIndex = index;
@@ -338,4 +301,4 @@ export default {
background-color: rgba(0, 0, 0, 0) !important;
}
}
</style>
</style>
pages/home/index.vue
+35 -324
View File
@@ -3,17 +3,7 @@
<view class="header acea-row row-column row-left" style="position: absolute;left: 0;right: 0;"
:style="{top:statusBarHeight+'px'}">
<view class="acea-row row-middle row-between" style="position: relative;z-index: 1;">
<view class="avatar-box acea-row row-middle">
<!-- 2023/4/13 隐藏，下方事件对应avatar-box-->
<!-- @click="avatarClick"-->
<!-- <image v-if="userInfo&&userInfo.avatar" class="avatar-img" :src="userInfo.avatar"></image>-->
<!-- <image v-else class="avatar-img" :src="webUrl+'/20230304135955831196.png'"></image>-->
<!-- <view class="acea-row row-middle"-->
<!-- style="background: #1E131B;border: 1px solid #FFFFFF;border-radius: 0 28rpx 28rpx 0;padding: 4rpx 10rpx 4rpx 20rpx;margin-left: -10rpx;height: 40rpx;box-sizing: content-box;">-->
<!-- <text style="" class="nickname-text">{{ userInfo.nickname || '' }}</text>-->
<!-- </view>-->
</view>
<view class="acea-row row-middle row-right" style="position: relative;z-index: 1;">
<view style="position: relative;color: #FFF;margin-left: 20rpx;margin-right: 20rpx;"
class="acea-row row-middle">
<image style="width: 36rpx;height: 36rpx;" :src="webUrl+'/20210616184302174394.png'" mode="">
@@ -21,12 +11,11 @@
<view style="margin-left: 10rpx;font-size: 28rpx;color: #fff;">客服</view>
<button class="cus-btn" open-type="contact"></button>
</view>
</view>
</view>
<!-- <view class="fixed-header-box"></view> -->
<view class="slider-banner" style="position: relative;">
<swiper style="height: 680rpx;" indicatorDots="true" indicator-color="rgba(255, 255, 255, .3)"
<swiper style="height: 510rpx;" indicatorDots="true" indicator-color="rgba(255, 255, 255, .3)"
indicator-active-color="#ffffff" v-if="banner.length > 0" autoplay circular>
<block v-for="(item, bannerIndex) in banner" :key="bannerIndex">
<swiper-item>
@@ -41,10 +30,6 @@
style="flex-wrap: nowrap;position: absolute;left: 0;bottom: 0;right: 0;background: rgba(0,0,0,0.6);padding: 10rpx 32rpx;">
<view class="news acea-row row-between-wrapper"
style="box-shadow: none !important;flex-grow: 1;flex-wrap: nowrap;background:transparent !important;border: none !important;margin: 0 30rpx 0 0 !important;padding: 0 !important;height: auto !important;">
<!-- <view class="notice acea-row row-middle" style="color: #fff;font-size: 24rpx;margin-right: 10rpx !important;">
欢迎新加入会员:
</view> -->
<view class="swiper-no-swiping new-banner" style="height: 34rpx !important;text-align: right;">
<swiper class="swiper-wrapper" style="height: 34rpx !important;" v-if="userList.length > 0" :interval="3000"
:indicator-dots="false" autoplay circular vertical>
@@ -61,11 +46,6 @@
</swiper>
</view>
</view>
<!-- <view class="acea-row row-middle row-between" style="flex-shrink: 0;flex-wrap: nowrap;margin-right: 30rpx;">
<view class="" style="color: #fff;font-size: 24rpx;margin-right: 10rpx;">香道滇会员总数:</view>
<view class="" style="color: #fff;font-size: 24rpx;text-align: right;">{{userTotal}}</view>
</view> -->
</view>
</view>
@@ -85,31 +65,10 @@
</view>
</view>
<!-- 快捷跳转块v4end -->
<view style="padding-bottom:20rpx;background: #fff;">
<!-- 转盘-->
<!-- <image class="home-luck" :src="`${webUrl}/20220519145845818243.png`" mode="scaleToFill" @click="goLuck"></image>-->
<!-- 通知开始 -->
<view v-if="showNotice" class="news acea-row row-between-wrapper" style="margin-top: 20rpx;margin-bottom: 20rpx;">
<view class="notice acea-row row-middle">
<image style="width: 102rpx;height:64rpx" :src="webUrl+'/20210609100702342165.png'" mode=""></image>
</view>
<view class="swiper-no-swiping new-banner">
<swiper class="swiper-wrapper" v-if="roll.length > 0" :indicator-dots="false" autoplay circular vertical>
<block v-for="(item, rollIndex) in roll" :key="rollIndex">
<swiper-item class="swiper-slide">
<view @click="goRoll(item)" class="swiper-item acea-row row-between-wrapper">
<view class="text acea-row row-between-wrapper">
<view class="label" v-if="item.show === '是'">最新</view>
<view class="newsTitle line1">{{ item.info }}</view>
</view>
<!-- <view class="iconfont icon-xiangyou"></view> -->
</view>
</swiper-item>
</block>
</swiper>
</view>
</view>
</view>
<!-- 伴手礼精品 -->
@@ -246,9 +205,6 @@
v-if="item.productPrice">￥{{ item.productPrice }}
</text>
</view>
<!-- <view class="shop flex"><text>{{item.merName}}</text>
<image class="icon-fire" :src="webUrl+'/20221118092713277343.png'" mode="scaleToFill"></image>
</view> -->
</view>
</view>
</view>
@@ -310,7 +266,6 @@
<script>
import {mapActions, mapGetters} from 'vuex';
import {formatDateTime} from "@/utils";
import {handleUrlParam} from '@/utils/index';
import config from '@/utils/mapConfig';
import PromotionGood from '@/components/PromotionGood';
@@ -321,13 +276,12 @@ import imgBox from '@/components/imageTypeSet/imagebox.vue'
import LsSwiper from '@/components//ls-swiper/index.vue'
import {noticeDetail, noticeList} from "@/api/user";
import {getHomeData, getShareImage, getWxLiveList, wxLiveSynchro} from '@/api/public';
import {getHomeData, getShareImage} from '@/api/public';
import {getHomeHotelList} from "@/api/inn.js";
import {getProducts} from "@/api/store";
import {sharpBannar} from "@/api/goods";
import NP from "number-precision";
const HAS_COUPON_WINDOW = 'has_coupon_window';
var that;
export default {
name: 'Index',
@@ -350,7 +304,6 @@ export default {
duration: 60000,
unReadMessageInfo: null,
webUrl: this.$VUE_APP_RESOURCES_URL,
showNotice: true, //是否显示通知
isLiving: true, //是否正在直播
showCoupon: false,
viewHeight: (750 * 3 / 4.0),
@@ -502,14 +455,9 @@ export default {
customBar = e.statusBarHeight + 45
// #endif
// 这里你可以自己决定存放方式，建议放在store中，因为store是实时变化的
// this.$store.commit('SET_STATUS_BAR', statusBar)
// this.$store.commit('SET_CUSTOM_BAR', customBar)
// this.$store.commit('SET_SYSTEM_INFO', e)
that.statusBarHeight = customBar;
//两列商品宽度
that.hotGoodsColumnWidth = (e.screenWidth - uni.upx2px(90)) / 2 + 'px';
//that.bslGoodsHeight = (e.screenWidth - uni.upx2px(90))/2*3/4+'px';
//状态栏图片高度
that.bgImgHeight = statusBar + 'px';
@@ -529,21 +477,13 @@ export default {
this.getUnreadMsgList();
}
//先同步后获取直播间列表
//this.getLiveList();
wxLiveSynchro().then(res => {
// this.getLiveList();
}).catch(err => {
// this.getLiveList();
})
//定位
this.getCurAddress();
this.init();
//获取团购商品
this.getGroupGoods();
},
onShareAppMessage(res) {
onShareAppMessage() {
return {
title: '云南香道滇官方商城',
path: '/pages/home/index',
@@ -571,7 +511,6 @@ export default {
that.$set(that, 'roll', res.data.roll);
that.$set(that, 'userList', res.data.lotteryRecord); //滚动会员信息
that.$set(that, 'userTotal', res.data.userTotal); //会员总数信息
//that.$set(that, 'activityOne', activityOne);
that.$set(that, 'info', res.data.info);
that.$set(that, 'firstList', res.data.firstList.map((item) => {
item.price = that.$force2Decimal(item.price);
@@ -606,7 +545,6 @@ export default {
that.likeInfo.forEach((item) => {
imgs.push(item.image);
})
// that.bslImglist = imgs;
that.$set(that, 'bslImglist', imgs);
that.seriesWidth = 770 * imgs.length - 20;
@@ -667,10 +605,6 @@ export default {
swiperChange(e) {
this.currentIndex = e.detail.current;
},
goMoreNewGoods: function () {
//跳转到分类
this.$yrouter.switchTab('/pages/shop/GoodsClass/index');
},
msgConfirm: function () {
that.$refs.popup.close();
},
@@ -756,17 +690,10 @@ export default {
q.cityName = this.cityName;
}
getHomeHotelList(q).then(res => {
that.innArray = [];
//that.innArray = res.data;
that.innArray.push.apply(that.innArray, res.data);
}).catch((err) => {
}).finally(() => {
});
})
},
getShopList: function () {
let that = this;
@@ -784,14 +711,8 @@ export default {
getHomeHotelList(q).then(res => {
that.shopArray = [];
//that.innArray = res.data;
that.shopArray.push.apply(that.shopArray, res.data);
}).catch((err) => {
}).finally(() => {
});
})
},
getRestaurantList: function () {
let that = this;
@@ -809,14 +730,8 @@ export default {
getHomeHotelList(q).then(res => {
that.restaurantArray = [];
//that.innArray = res.data;
that.restaurantArray.push.apply(that.restaurantArray, res.data);
}).catch((err) => {
}).finally(() => {
});
})
},
goMoreBoutiqueGift: function () {
//跳转伴手礼分类
@@ -827,36 +742,6 @@ export default {
}
});
},
goMoreGroupBuy: function () {
//跳转伴手礼分类
this.$yrouter.reLaunch({
path: '/pages/shop/GoodsClass/index',
query: {
id: 19
}
});
},
goProducts: function () {
//跳转伴手礼分类
this.$yrouter.reLaunch({
path: '/pages/shop/GoodsClass/index'
});
},
goLiveList: function () {
this.$yrouter.push('/pages/LiveBroadcastList/LiveBroadcastList');
},
goShotVideo: function () {
this.$yrouter.push('/pages/VideoPlayBackList/VideoPlayBackList');
},
goInnDetail: function (item) {
//跳转到客栈详情
this.$yrouter.push({
path: "/pagesInn/inn/innHome",
query: {
id: item.id
}
});
},
goPreSale: function () {
this.$yrouter.push("/v4/views/preSale/preSale")
},
@@ -866,88 +751,26 @@ export default {
setMsgReaded: function (mid) {
noticeDetail({
id: mid
}).then((res) => {
}).catch((err) => {
})
},
getLiveList: function () {
//直播间状态 101：直播中，102：未开始，103 已结束，104 禁播，105：暂停，106：异常，107：已过期
var params = {
limit: 1,
page: 0,
liveStatus: 101 //101-直播中
}
// mescroll.endByPage(0, 0);
// return;
let that = this;
getWxLiveList(params)
.then(res => {
if (res.data && res.data.content && res.data.content.length > 0) {
that.liveList = res.data.content;
that.isLiving = true;
} else {
that.isLiving = false;
}
})
.catch(err => {
})
},
getUnreadMsgList: function () {
var params = {
limit: 10,
page: 1
}
// mescroll.endByPage(0, 0);
// return;
let that = this;
noticeList(params)
.then(res => {
if (res.data && res.data.length > 0) {
var msg = res.data[0];
if (msg.readFlag == 'RF0') {
that.unReadMessageInfo = msg;
that.$refs.popup.open();
that.setMsgReaded(msg.id);
}
}
})
.catch(err => {
})
noticeList(params).then(res => {
if (res.data && res.data.length > 0) {
var msg = res.data[0];
if (msg.readFlag == 'RF0') {
that.unReadMessageInfo = msg;
that.$refs.popup.open();
that.setMsgReaded(msg.id);
}
}
})
},
noticeClose: function () {
this.showNotice = false;
},
//
livingButtonClick: function () {
// //是否在直播
// if(this.isLiving){
// //跳转到直播界面
// var live = this.liveList[0];
// var liveAppId = this.$WX_LIVE_APPID;
// wx.navigateTo({
// url: `plugin-private://${liveAppId}/pages/live-player-plugin?room_id=${live.roomId}`
// });
// }else{
// //跳转到视频回放界面
// this.$yrouter.push('/pages/VideoPlayBackList/VideoPlayBackList')
// }
//跳转到视频回放界面
this.$yrouter.push('/pages/LiveAndShortVideo/LiveAndShortVideo')
},
avatarClick: function () {
this.$yrouter.switchTab('/pages/user/User/index');
},
call: function () {
if (this.companyTel != undefined && this.companyTel.length > 0) {
@@ -971,32 +794,10 @@ export default {
if (item.uniapp_url) {
this.$yrouter.push(item.uniapp_url)
}
// this.$yrouter.push("/pages/shop/GoodsCon/index?id="+item.id)
},
goGoodSearch() {
// this.$yrouter.push('/pages/shop/GoodsEvaluate/index');
this.$yrouter.push('/pages/shop/GoodSearch/index');
},
goWxappUrl(item) {
this.$yrouter.push(item.uniapp_url);
},
goHotNewGoods(type) {
this.$yrouter.push({
path: '/pages/shop/HotNewGoods/index',
query: {
type
}
});
},
goBSLGoods(index) {
var item = this.likeInfo[index];
this.$yrouter.push({
path: '/pages/shop/GoodsCon/index',
query: {
id: item.id
}
});
},
goGoodsCon(item) {
this.$yrouter.push({
path: '/pages/shop/GoodsCon/index',
@@ -1012,56 +813,6 @@ export default {
id: item.productId,
activityId: item.id,
from
}
});
},
goGoodsPromotion() {
this.$yrouter.push('/pages/shop/GoodsPromotion/index');
},
startQr: function () {
uni.scanCode({
success: (res) => {
let option = handleUrlParam(res.result)
// {productId: "19", spread: "21", codeType: "routine"}
// {productId: "19", spread: "21", pageType: "good", codeType: "routine"}
switch (option.pageType) {
case 'good':
// 跳转商品详情
this.$yrouter.push({
path: '/pages/shop/GoodsCon/index',
query: {
q: res.result
}
});
break;
case 'group':
// 跳转团购
this.$yrouter.push({
path: '/pages/activity/GroupRule/index',
query: {
q: res.result
}
});
break;
case 'dargain':
// 跳转砍价
this.$yrouter.push({
path: '/pages/activity/DargainDetails/index',
query: {
q: res.result
}
});
break;
default:
// 跳转分销
this.$yrouter.push({
path: '/pages/Loading/index',
query: {}
});
break;
}
}
});
}
@@ -1107,7 +858,6 @@ export default {
.index .header {
height: auto !important;
background-color: transparent !important;
}
.swiper-item {
@@ -1130,7 +880,6 @@ export default {
.member-box {
// padding: 32rpx;
margin-bottom: 32rpx;
}
@@ -1165,7 +914,6 @@ export default {
box-sizing: border-box;
margin-right: 16rpx;
margin-left: -30rpx;
// background:linear-gradient(90deg,rgba(196,199,255,1) 0%,rgba(56,104,253,1) 100%);
background: rgba(138, 143, 203, 1);
border-radius: 0px 16*2rpx 16*2rpx 0px;
}
@@ -1174,7 +922,6 @@ export default {
width: 20*2rpx;
height: 20*2rpx;
margin-right: 5*2rpx;
}
.live-broadcast-box .living-box {
@@ -1197,10 +944,6 @@ export default {
.slider-banner {
-webkit-transform: rotate(0);
// margin-top: -187rpx;
// border-radius: 20rpx;
// margin-left: 30rpx;
// margin-right: 30rpx;
width: auto !important;
}
@@ -1208,15 +951,12 @@ export default {
.header {
background-repeat: no-repeat;
background-size: 100% 100%;
//height: 680rpx !important;
}
.header .paper-cuts-img {
position: absolute;
width: 159*2rpx;
height: 159*2rpx;
// left: calc((100% - 159*2rpx)/2);
// top: calc((100% - 159*2rpx)/2);
top: 0;
left: 0;
bottom: 0;
@@ -1235,16 +975,12 @@ export default {
padding: 0 28rpx;
font-size: 28rpx;
color: #acacac;
box-sizing: border-box;
// border: 1px solid #ffffff;
border-radius: 32rpx;
margin: 0 30rpx;
}
.notice {
margin-right: 24rpx;
// background:linear-gradient(145deg,rgba(252,85,179,1) 0%,rgba(255,45,105,1) 100%);
// border-radius:0px 4*2rpx 4*2rpx 8*2rpx;
color: #fff;
text-align: center;
font-size: 12*2rpx;
@@ -1268,7 +1004,7 @@ export default {
.company-hline {
width: 28*2rpx;
height: 0px;
height: 0;
border: 1px solid rgba(56, 104, 253, 1);
}
@@ -1279,7 +1015,7 @@ export default {
.h-line {
width: 28*2rpx;
height: 0px;
height: 0;
border: 1px solid rgba(255, 121, 0, 1);
}
@@ -1300,7 +1036,6 @@ export default {
.hotGoodsList {
position: relative;
margin: 35rpx 0;
// background-color: #fff;
flex-wrap: wrap;
}
@@ -1355,7 +1090,6 @@ export default {
.pro-info {
font-size: 14*2rpx;
}
.company-logo-box {
@@ -1365,19 +1099,14 @@ export default {
.company-info-box {
padding: 24rpx 24rpx 32rpx 24rpx;
background: rgba(255, 255, 255, 1);
//box-shadow:0px 6rpx 12rpx rgba(0,0,0,0.1);
//border-radius:12rpx;
box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.1);
border-radius: 0px 12rpx 12rpx 12rpx;
box-shadow: 0 6rpx 12rpx rgba(0, 0, 0, 0.1);
border-radius: 0 12rpx 12rpx 12rpx;
flex-wrap: nowrap !important;
// margin-top: 35*2rpx;
}
.company-info {
flex: 1;
margin-left: 16rpx;
}
.company-tel-box {
@@ -1421,7 +1150,7 @@ export default {
}
.line {
height: 0px;
height: 0;
border: 1px solid rgba(235, 236, 240, 1);
margin-top: 10*2rpx;
margin-bottom: 10*2rpx;
@@ -1433,7 +1162,6 @@ export default {
}
.new-tag {
// margin-right: 10rpx;
padding: 1*2rpx 3*2rpx;
width: 29*2rpx;
height: 14*2rpx;
@@ -1457,17 +1185,14 @@ export default {
}
.index .wrapper.hot .newProducts {
// margin: 25rpx 25rpx 35rpx 25rpx;
margin: 10rpx 0rpx 0rpx 0rpx;
box-shadow: none;
background: none;
padding: 0rpx 0rpx 0rpx 0rpx;
// padding: 0;
}
.index .news {
margin: 0rpx 30rpx !important;
margin-bottom: 0;
border-radius: 8rpx !important;
background: #f7f7f7 !important;
border: none !important;
@@ -1482,10 +1207,6 @@ export default {
border: none;
}
.index .wrapper .title .text {
}
.index .wrapper .title .text .name {
font-size: 18*2rpx !important;
color: #fff !important;
@@ -1524,7 +1245,6 @@ export default {
margin-top: 20rpx;
}
.msg_content {
padding: 0.1*100rpx;
color: #080F1A;
@@ -1534,8 +1254,6 @@ export default {
.msg_btn {
padding: 10rpx;
font-size: 34rpx;
// border: 1px solid #333;
color: #38afef;
margin-top: 20rpx;
margin-bottom: 20rpx;
@@ -1609,13 +1327,13 @@ export default {
// v4
.fast-nav {
flex-wrap: wrap;
padding: 40rpx 32rpx 0;
padding: 40rpx 68rpx 0;
background: #fff;
.item {
width: 88rpx;
margin-right: 60rpx;
margin-bottom: 40rpx;
width: 86rpx;
margin-right: 46rpx;
margin-bottom: 36rpx;
}
.item:nth-child(5n) {
@@ -1623,17 +1341,16 @@ export default {
}
image {
width: 88rpx;
height: 88rpx;
width: 86rpx;
height: 86rpx;
margin-bottom: 10rpx;
}
.one-t {
width: 110rpx;
margin-top: 8rpx;
color: #666666;
font-size: 22rpx;
font-weight: 500;
line-height: 32rpx;
color: #666;
font-size: 26rpx;
line-height: 1;
text-align: center;
}
}
@@ -1649,7 +1366,7 @@ export default {
box-sizing: border-box;
margin: 0 20rpx;
padding-bottom: 14rpx;
box-shadow: 0px 6rpx 16rpx rgba(148, 148, 148, 0.16);
box-shadow: 0 6rpx 16rpx rgba(148, 148, 148, 0.16);
}
.money {
@@ -1826,7 +1543,6 @@ export default {
}
}
.desc-line {
display: flex;
align-items: center;
@@ -1917,7 +1633,6 @@ export default {
position: relative;
flex-direction: column;
width: 328rpx;
// height: 528rpx;
margin-top: 20rpx;
background: #fff;
@@ -1932,10 +1647,6 @@ export default {
height: 24rpx;
}
.content {
// position: relative;
}
.title {
display: -webkit-box;
-webkit-box-orient: vertical;
pages/order/OrderSubmission/index.vue
+3 -3
View File
@@ -142,13 +142,13 @@
</view>
</view>
</view>
<view class="item">
<view class="item" style="z-index: -1">
<view class="acea-row row-middle">
<image style="width: 32rpx;height: 32rpx;margin-right: 12rpx;" :src="webUrl+'/20210807230836494421.png'"
mode=""></image>
<text class="">备注信息（150字以内</text>
<text class="">备注信息（150字以内)</text>
</view>
<textarea v-model="mark"></textarea>
<textarea v-model="mark" ></textarea>
</view>
</view>
<view class="wrapper" style="margin: 30rpx 0;border-radius: 16rpx;">
pages/order/ReturnList/index.vue
+19 -20
View File
@@ -3,19 +3,16 @@
<view class="goodWrapper" v-for="(order,orderListIndex) in orderList" :key="orderListIndex">
<view class="iconfont icon-tuikuanzhong powder" v-if="order._status._type === '-1'"></view>
<view class="iconfont icon-yituikuan" v-if="order._status._type === '-2'"></view>
<image class="iconfont" :src="webUrl+'/20230713110051999762.png'" v-if="order._status._type === '-3'"/>
<view class="orderNum">订单号：{{ order.orderId }}</view>
<!-- <view class="acea-row row-between row-middle orderNum" style="flex-wrap: nowrap;">
<view class="orderNum">订单号：{{ order.orderId }}</view>
<view class="font-color-red" style="flex-shrink: 0;font-size: 28rpx;">{{order._status._title}}</view>
</view> -->
<view
class="item acea-row row-between-wrapper"
v-for="(cart,cartInfoIndex) in order.cartInfo"
:key="cartInfoIndex"
@click="goOrderDetails(order)"
class="item acea-row row-between-wrapper"
v-for="(cart,cartInfoIndex) in order.cartInfo"
:key="cartInfoIndex"
@click="goOrderDetails(order)"
>
<view class="pictrue">
<image :src="cart.productInfo.image" class="image" @click.stop="goGoodsCon(cart)" />
<image :src="cart.productInfo.image" class="image" @click.stop="goGoodsCon(cart)"/>
</view>
<view class="text">
<view class="acea-row row-between-wrapper">
@@ -23,9 +20,10 @@
<view class="num">x {{ cart.cartNum }}</view>
</view>
<view
class="attr line1"
v-if="cart.productInfo.attrInfo"
>{{ cart.productInfo.attrInfo.sku }}</view>
class="attr line1"
v-if="cart.productInfo.attrInfo"
>{{ cart.productInfo.attrInfo.sku }}
</view>
<view class="attr line1" v-else>{{ cart.productInfo.storeName }}</view>
<view class="money">￥{{ cart.productInfo.price }}</view>
</view>
@@ -33,13 +31,14 @@
<view class="totalSum">
共{{ order.cartInfo.length || 0 }}件商品，总金额
<text
class="font-color-red price"
>￥{{ order.payPrice }}</text>
class="font-color-red price"
>￥{{ order.payPrice }}
</text>
</view>
</view>
<view class="noCart" v-if="orderList.length === 0 && page > 1">
<view class="pictrue">
<image :src="webUrl+'/20210203155245713983.png'" />
<image :src="webUrl+'/20210203155245713983.png'"/>
</view>
</view>
<Loading :loaded="loaded" :loading="loading"></Loading>
@@ -47,7 +46,7 @@
</template>
<script>
import { getOrderList } from "@/api/order";
import {getOrderList} from "@/api/order";
import Loading from "@/components/Loading";
export default {
@@ -57,7 +56,7 @@ export default {
},
data() {
return {
webUrl:this.$VUE_APP_RESOURCES_URL,
webUrl: this.$VUE_APP_RESOURCES_URL,
orderList: [],
page: 1,
limit: 20,
@@ -69,17 +68,17 @@ export default {
goGoodsCon(cart) {
this.$yrouter.push({
path: "/pages/shop/GoodsCon/index",
query: { id: cart.productInfo.id }
query: {id: cart.productInfo.id}
});
},
goOrderDetails(order) {
this.$yrouter.push({
path: "/pages/order/OrderDetails/index",
query: { id: order.orderId }
query: {id: order.orderId}
});
},
getOrderList() {
const { page, limit } = this;
const {page, limit} = this;
if (this.loading || this.loaded) return;
this.loading = true;
getOrderList({
pages/shop/GoodsCon/index.vue
+9 -7
View File
@@ -400,11 +400,12 @@
<!-- 商品详情开始 -->
<view class="product-intro" style="margin-top: 24rpx">
<!-- 原模块 -->
<view class="conter" v-html="storeInfo.description" v-if="from!='pre' && from!='day'"></view>
<!-- <view class="conter" v-html="storeInfo.description" ></view>-->
<rich-text :nodes="storeInfo.description" v-if="from!='pre' && from!='day'"/>
<!-- v4 预售详情 -->
<view class="conter" v-html="preInfo.description" v-if="from==='pre'"></view>
<rich-text :nodes="preInfo.description" v-if="from==='pre'"/>
<!-- v4 每日特价详情 -->
<view class="conter" v-html="dayInfo.description" v-if="from==='day'"></view>
<rich-text :nodes="dayInfo.description" v-if="from==='day'"/>
</view>
<!-- 商品详情结束 -->
@@ -932,10 +933,11 @@ export default {
});
getProductDetail(that.id, from)
.then(res => {
res.data.storeInfo.description = res.data.storeInfo.description.replace(
/\<img/gi,
'<img style="max-width:100%;height:auto;"'
);
// 会造成两个style属性，并且生效的是后一个
// res.data.storeInfo.description = res.data.storeInfo.description.replace(
// /\<img/gi,
// '<img style="display:block;max-width:100%;height:auto;"'
// );
that.$set(that, "storeInfo", res.data.storeInfo);
that.isWenwan = res.data.isWenwan;