Loki/fish-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化细节问题

Browse Source
This commit is contained in:
Gao xiaosong
2021-04-18 15:28:14 +08:00
parent 829daf1f61
commit 7333043a4f
10 changed files with 863 additions and 904 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/OrderGoods.vue
+3 -1
View File
@@ -12,7 +12,8 @@
<view class="num">x {{ cart.cartNum }}</view> <view class="num">x {{ cart.cartNum }}</view>
</view> </view>
<view class="attr line1" v-if="cart.productInfo.attrInfo">{{ cart.productInfo.attrInfo.sku }}</view> <view class="attr line1" v-if="cart.productInfo.attrInfo">{{ cart.productInfo.attrInfo.sku }}</view>
<view class="money font-color-red">￥{{ cart.truePrice }}</view> <view class="money font-color-red" v-if="isIntegral">{{ cart.costPrice }}积分</view>
<view class="money font-color-red" v-else>￥{{ cart.truePrice }}</view>
<view class="evaluate" v-if="evaluate == 3 && cart.isReply == 0" @click="routerGo(cart)">评价</view> <view class="evaluate" v-if="evaluate == 3 && cart.isReply == 0" @click="routerGo(cart)">评价</view>
</view> </view>
</view> </view>
@@ -28,6 +29,7 @@ export default {
type: Array, type: Array,
default: () => [], default: () => [],
}, },
isIntegral: Boolean,
}, },
data: function() { data: function() {
return {} return {}
config/index.js
+3 -2
View File
@@ -1,6 +1,7 @@
// export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api'; export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api'
// export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api'; // export const VUE_APP_API_URL = 'http://139.186.134.205:9006/api'
// export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api'
// export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
// export const VUE_APP_API_URL = 'https://tapi.xinxintuan.co/api' // export const VUE_APP_API_URL = 'https://tapi.xinxintuan.co/api'
// export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
main.js
+40 -45
View File
@@ -14,7 +14,7 @@ Vue.component('cu-custom', cuCustom)
Vue.config.productionTip = false Vue.config.productionTip = false
Vue.config.devtools = process.env.NODE_ENV !== 'production' Vue.config.devtools = process.env.NODE_ENV !== 'production'
Vue.prototype.$validator = function (rule) { Vue.prototype.$validator = function(rule) {
return new schema(rule) return new schema(rule)
} }
@@ -27,23 +27,6 @@ const app = new Vue({
store, store,
}) })
Vue.mixin({
onLoad() {
const { $mp } = this.$root
this._route = parseRoute($mp)
},
onShow() {
_router.app = this
_router.currentRoute = this._route
},
// 这里为了解决 .vue文件中 template 无法获取 VUE.prototype 绑定的变量
computed: {
$VUE_APP_RESOURCES_URL() {
return VUE_APP_RESOURCES_URL;
}
}
})
Object.defineProperty(Vue.prototype, '$yrouter', { Object.defineProperty(Vue.prototype, '$yrouter', {
get() { get() {
return _router return _router
@@ -59,17 +42,16 @@ Object.defineProperty(Vue.prototype, '$yroute', {
Vue.prototype.$VUE_APP_API_URL = VUE_APP_API_URL Vue.prototype.$VUE_APP_API_URL = VUE_APP_API_URL
Vue.component('cu-custom', cuCustom) Vue.component('cu-custom', cuCustom)
let deviceType = ''
// #ifdef APP-PLUS // #ifdef APP-PLUS
// App平台编译的代码 // App平台编译的代码
Vue.prototype.$deviceType = 'app' deviceType = 'app'
store.commit('updateDevicetype', 'app')
Vue.prototype.$platform = uni.getSystemInfoSync().platform Vue.prototype.$platform = uni.getSystemInfoSync().platform
// #endif // #endif
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
// 微信小程序编译的代码 // 微信小程序编译的代码
Vue.prototype.$deviceType = 'routine' deviceType = 'routine'
store.commit('updateDevicetype', 'routine')
// #endif // #endif
// !!! ps 不建议在 template 中使用 $deviceType 去判断当前环境，很有可能出现 $deviceType 为 undefined 导致判断出错的问题，可以在 script 模块中正常使用 // !!! ps 不建议在 template 中使用 $deviceType 去判断当前环境，很有可能出现 $deviceType 为 undefined 导致判断出错的问题，可以在 script 模块中正常使用
@@ -99,29 +81,42 @@ if (urlSpread) {
// #endif // #endif
async function init() { // #ifdef H5
// #ifdef H5 // H5编译的代码
// H5编译的代码 // 判断是否是微信浏览器
// 判断是否是微信浏览器 if (isWeixin()) {
if (isWeixin()) { deviceType = 'weixin'
Vue.prototype.$deviceType = 'weixin' let wechatInit = await wechat()
store.commit('updateDevicetype', 'weixin') if (wechatInit) {
let wechatInit = await wechat() await oAuth()
console.log(wechatInit)
if (wechatInit) {
await oAuth()
app.$mount()
}
} else {
Vue.prototype.$deviceType = 'weixinh5'
store.commit('updateDevicetype', 'weixinh5')
app.$mount()
} }
// #endif } else {
deviceType = 'weixinh5'
// #ifndef H5
app.$mount()
// #endif
} }
// #endif
init() Vue.prototype.$deviceType = deviceType
Vue.mixin({
onLoad() {
const { $mp } = this.$root
this._route = parseRoute($mp)
},
onShow() {
_router.app = this
_router.currentRoute = this._route
},
// 这里为了解决 .vue文件中 template 无法获取 VUE.prototype 绑定的变量
computed: {
$VUE_APP_RESOURCES_URL() {
return VUE_APP_RESOURCES_URL
},
$deviceType() {
return deviceType
},
},
})
store.commit('updateDevicetype', deviceType)
app.$mount()
pages/home/index.vue
+409 -419
View File
@@ -1,448 +1,438 @@
<template> <template>
<view class="index"> <view class="index">
<view v-for="(item,index) in homeData" :key="index"> <view v-for="(item, index) in homeData" :key="index">
<view class="head_box" v-if="item.type=='header'" :style="{ background: bgcolor }" :class="{ active: bgcolor }"> <view class="head_box" v-if="item.type == 'header'" :style="{ background: bgcolor }" :class="{ active: bgcolor }">
<cu-custom :isBack="true" :bgColor="bgcolor"> <cu-custom :isBack="true" :bgColor="bgcolor">
<block slot="backText"> <block slot="backText">
<text class="nav-title shopro-selector-rect">{{ item.componentContent.title }}</text> <text class="nav-title shopro-selector-rect">{{ item.componentContent.title }}</text>
</block> </block>
</cu-custom> </cu-custom>
</view> </view>
<view class="header header-search acea-row row-center-wrapper" v-if="item.type=='search'" :style="{ background: bgcolor }"> <view class="header header-search acea-row row-center-wrapper" v-if="item.type == 'search'" :style="{ background: bgcolor }">
<view @click="goGoodSearch()" class="search acea-row row-middle"> <view @click="goGoodSearch()" class="search acea-row row-middle">
<text class="iconfont icon-xiazai5"></text> <text class="iconfont icon-xiazai5"></text>
搜索商品 搜索商品
</view> </view>
<view class="qr" @click="startQr()"> <!-- #ifndef H5 -->
<image :src="`${$VUE_APP_RESOURCES_URL}/images/qr.png`" /> <view class="qr" @click="startQr()" v-if="$deviceType !== 'weixin'">
</view> <image :src="`${$VUE_APP_RESOURCES_URL}/images/qr.png`" />
</view> </view>
<Banner v-if="item.type=='banner'" :detail="item.componentContent.bannerData" @getbgcolor="getbgcolor"></Banner> <!-- #endif -->
<uni-notice-bar v-if="item.type=='noticeBar'" scrollable="true" @click="goRoll(item.componentContent.roll[0])" </view>
single="true" :speed="10" showIcon="true" :text="item.componentContent.roll[0].info"></uni-notice-bar> <Banner v-if="item.type == 'banner'" :detail="item.componentContent.bannerData" @getbgcolor="getbgcolor"></Banner>
<view class="content_box home_content_box" v-if="item.type=='menu'&&item.componentContent.menus"> <uni-notice-bar v-if="item.type == 'noticeBar'" scrollable="true" @click="goRoll(item.componentContent.roll[0])" single="true" :speed="10" showIcon="true" :text="item.componentContent.roll[0].info"></uni-notice-bar>
<!-- 菜单 --> <view class="content_box home_content_box" v-if="item.type == 'menu' && item.componentContent.menus">
<Menu :list="item.componentContent.menus" ></Menu> <!-- 菜单 -->
</view> <Menu :list="item.componentContent.menus"></Menu>
<!-- 滚动新闻 --> </view>
<!-- 广告 --> <!-- 滚动新闻 -->
<Adv v-if="item.type=='adv'&&item.componentContent.detail" :detail="item.componentContent.detail" /> <!-- 广告 -->
<!-- 热门榜单 --> <Adv v-if="item.type == 'adv' && item.componentContent.detail" :detail="item.componentContent.detail" />
<HotCommodity v-if="item.type=='hotCommodity'" :detail="likeInfo"></HotCommodity> <!-- 热门榜单 -->
<!-- 超值拼团 --> <HotCommodity v-if="item.type == 'hotCommodity'" :detail="likeInfo"></HotCommodity>
<Groupon v-if="item.type=='groupon'" :detail="combinationList" /> <!-- 超值拼团 -->
<!-- 首发新品->秒杀 --> <Groupon v-if="item.type == 'groupon'" :detail="combinationList" />
<FirstNewProduct v-if="item.type=='firstNewProduct'" :detail="firstList"></FirstNewProduct> <!-- 首发新品->秒杀 -->
<!-- 精品推荐 --> <FirstNewProduct v-if="item.type == 'firstNewProduct'" :detail="firstList"></FirstNewProduct>
<ProductsRecommended v-if="item.type=='productsRecommended'" :detail="bastList"></ProductsRecommended> <!-- 精品推荐 -->
<!-- 促销单品 --> <ProductsRecommended v-if="item.type == 'productsRecommended'" :detail="bastList"></ProductsRecommended>
<PromoteProduct v-if="item.type=='promoteProduct'" :detail="benefit"></PromoteProduct> <!-- 促销单品 -->
<!-- 直播 --> <PromoteProduct v-if="item.type == 'promoteProduct'" :detail="benefit"></PromoteProduct>
<!-- #ifdef MP-WEIXIN --> <!-- 直播 -->
<Live v-if="item.type=='live'" :detail="live"></Live> <!-- #ifdef MP-WEIXIN -->
<!-- #endif --> <Live v-if="item.type == 'live'" :detail="live"></Live>
<!-- 为您推荐 --> <!-- #endif -->
<PromotionGood v-if="item.type=='promotionGood'" :benefit="benefit"></PromotionGood> <!-- 为您推荐 -->
<Coupon-window :coupon-list="couponList" v-if="showCoupon" @checked="couponClose" @close="couponClose"> <PromotionGood v-if="item.type == 'promotionGood'" :benefit="benefit"></PromotionGood>
</Coupon-window> <Coupon-window :coupon-list="couponList" v-if="showCoupon" @checked="couponClose" @close="couponClose"> </Coupon-window>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import { import { mapState, mapMutations, mapActions } from 'vuex'
mapState, import GoodList from '@/components/GoodList'
mapMutations, import PromotionGood from '@/components/PromotionGood'
mapActions import CouponWindow from '@/components/CouponWindow'
} from "vuex"; import Menu from '@/components/Menu'
import GoodList from "@/components/GoodList"; import UniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar'
import PromotionGood from "@/components/PromotionGood"; import Adv from '@/components/sh-adv'
import CouponWindow from "@/components/CouponWindow"; import Groupon from '@/components/sh-groupon.vue'
import Menu from "@/components/Menu";
import UniNoticeBar from "@/components/uni-notice-bar/uni-notice-bar";
import Adv from "@/components/sh-adv";
import Groupon from "@/components/sh-groupon.vue";
import Banner from "./components/Banner"; import Banner from './components/Banner'
import HotCommodity from "./components/HotCommodity"; import HotCommodity from './components/HotCommodity'
import FirstNewProduct from "./components/FirstNewProduct"; import FirstNewProduct from './components/FirstNewProduct'
import ProductsRecommended from "./components/ProductsRecommended"; import ProductsRecommended from './components/ProductsRecommended'
import Live from "./components/Live"; import Live from './components/Live'
import { import { getHomeData, getShare, getCanvas } from '@/api/public'
getHomeData, import cookie from '@/utils/store/cookie'
getShare, import { isWeixin, handleUrlParam } from '@/utils/index'
getCanvas
} from "@/api/public";
import cookie from "@/utils/store/cookie";
import {
isWeixin,
handleUrlParam
} from "@/utils/index";
import { import { openShareAll } from '@/libs/wechat'
openShareAll,
} from '@/libs/wechat'
const HAS_COUPON_WINDOW = "has_coupon_window"; const HAS_COUPON_WINDOW = 'has_coupon_window'
export default { export default {
name: "Index", name: 'Index',
components: { components: {
// swiper, // swiper,
// swiperSlide, // swiperSlide,
UniNoticeBar, UniNoticeBar,
GoodList, GoodList,
PromotionGood, PromotionGood,
CouponWindow, CouponWindow,
Menu, Menu,
Adv, Adv,
Groupon, Groupon,
Banner, Banner,
HotCommodity, HotCommodity,
FirstNewProduct, FirstNewProduct,
ProductsRecommended, ProductsRecommended,
Live, Live,
}, },
props: {}, props: {},
data: function() { data: function() {
return { return {
homeData: [], homeData: [],
CustomBar: this.CustomBar, CustomBar: this.CustomBar,
StatusBar: this.StatusBar, StatusBar: this.StatusBar,
formatMenus: [], formatMenus: [],
categoryCurrent: 0, categoryCurrent: 0,
menuNum: 4, menuNum: 4,
bgcolor: "", bgcolor: '',
bgColor: "", bgColor: '',
swiperCurrent: 0, //轮播下标 swiperCurrent: 0, //轮播下标
webviewId: 0, webviewId: 0,
showCoupon: false, showCoupon: false,
logoUrl: "", logoUrl: '',
banner: [], banner: [],
menus: [], menus: [],
combinationList: [], combinationList: [],
roll: [], roll: [],
activity: [], activity: [],
activityOne: {}, activityOne: {},
bastList: [], bastList: [],
firstList: [], firstList: [],
info: { info: {
fastList: [], fastList: [],
bastBanner: [], bastBanner: [],
bastList: [], bastList: [],
}, },
likeInfo: [], likeInfo: [],
live: [], live: [],
lovely: [], lovely: [],
benefit: [], benefit: [],
couponList: [], couponList: [],
swiperOption: { swiperOption: {
pagination: { pagination: {
el: ".swiper-pagination", el: '.swiper-pagination',
clickable: true, clickable: true,
}, },
autoplay: { autoplay: {
disableOnInteraction: false, disableOnInteraction: false,
delay: 2000, delay: 2000,
}, },
loop: true, loop: true,
speed: 1000, speed: 1000,
observer: true, observer: true,
observeParents: true, observeParents: true,
}, },
swiperRoll: { swiperRoll: {
direction: "vertical", direction: 'vertical',
autoplay: { autoplay: {
disableOnInteraction: false, disableOnInteraction: false,
delay: 2000, delay: 2000,
}, },
loop: true, loop: true,
speed: 1000, speed: 1000,
observer: true, observer: true,
observeParents: true, observeParents: true,
}, },
swiperScroll: { swiperScroll: {
freeMode: true, freeMode: true,
freeModeMomentum: false, freeModeMomentum: false,
slidesPerView: "auto", slidesPerView: 'auto',
observer: true, observer: true,
observeParents: true, observeParents: true,
}, },
swiperBoutique: { swiperBoutique: {
pagination: { pagination: {
el: ".swiper-pagination", el: '.swiper-pagination',
clickable: true, clickable: true,
}, },
autoplay: { autoplay: {
disableOnInteraction: false, disableOnInteraction: false,
delay: 2000, delay: 2000,
}, },
loop: true, loop: true,
speed: 1000, speed: 1000,
observer: true, observer: true,
observeParents: true, observeParents: true,
}, },
swiperProducts: { swiperProducts: {
freeMode: true, freeMode: true,
freeModeMomentum: false, freeModeMomentum: false,
slidesPerView: "auto", slidesPerView: 'auto',
observer: true, observer: true,
observeParents: true, observeParents: true,
}, },
bgImage: "", bgImage: '',
}; }
}, },
computed: { computed: {
singNew() { singNew() {
return this.roll.length > 0 ? this.roll[0] : "你还没添加通知哦！"; return this.roll.length > 0 ? this.roll[0] : '你还没添加通知哦！'
}, },
customStyle() { customStyle() {
var bgImage = this.bgImage; var bgImage = this.bgImage
// var style = `height:${this.CustomBar}px;padding-top:${0}px;background: ${this.bgcolor}`; // var style = `height:${this.CustomBar}px;padding-top:${0}px;background: ${this.bgcolor}`;
var style = `height:${this.CustomBar}px;padding-top:${this.StatusBar}px;background: ${this.bgcolor}`; var style = `height:${this.CustomBar}px;padding-top:${this.StatusBar}px;background: ${this.bgcolor}`
if (this.bgImage) { if (this.bgImage) {
style = `${style}background-image:url(${bgImage});`; style = `${style}background-image:url(${bgImage});`
} }
return style; return style
}, },
}, },
onLoad: function() { onLoad: function() {
this.getLocation(); this.getLocation()
let that = this; let that = this
// uni.showLoading({ // uni.showLoading({
// title: "加载中", // title: "加载中",
// }); // });
getCanvas().then(res => {}).catch(error => { getCanvas()
this.homeData = JSON.parse(error.data.json) .then(res => {})
console.log(this.homeData) .catch(error => {
console.log(222) this.homeData = JSON.parse(error.data.json)
}) console.log(this.homeData)
getHomeData().then((res) => { console.log(222)
that.logoUrl = res.data.logoUrl; })
res.data.banner.map((item) => (item.bgcolor = item.color || "")); getHomeData().then(res => {
that.$set(that, "info", res.data.info); that.logoUrl = res.data.logoUrl
that.$set(that, "firstList", res.data.firstList); res.data.banner.map(item => (item.bgcolor = item.color || ''))
that.$set(that, "bastList", res.data.bastList); that.$set(that, 'info', res.data.info)
that.$set(that, "likeInfo", res.data.likeInfo); that.$set(that, 'firstList', res.data.firstList)
that.$set(that, "live", res.data.liveList); that.$set(that, 'bastList', res.data.bastList)
that.$set(that, "lovely", res.data.lovely); that.$set(that, 'likeInfo', res.data.likeInfo)
that.$set(that, "benefit", res.data.benefit); that.$set(that, 'live', res.data.liveList)
that.$set(that, "couponList", res.data.couponList); that.$set(that, 'lovely', res.data.lovely)
that.$set(that, "combinationList", res.data.combinationList); that.$set(that, 'benefit', res.data.benefit)
uni.hideLoading(); that.$set(that, 'couponList', res.data.couponList)
that.setOpenShare(); that.$set(that, 'combinationList', res.data.combinationList)
// that.doColorThief() uni.hideLoading()
}); that.setOpenShare()
}, // that.doColorThief()
methods: { })
...mapActions(["getLocation"]), },
onShareTimeline: function() { methods: {
return { ...mapActions(['getLocation']),
title: this.miniHomeRemark, onShareTimeline: function() {
imageUrl: this.miniHomeImg, return {
path: "pages/home/index?spread=" + uni.getStorageSync("uid"), title: this.miniHomeRemark,
}; imageUrl: this.miniHomeImg,
}, path: 'pages/home/index?spread=' + uni.getStorageSync('uid'),
onShareAppMessage: function() { }
return { },
title: this.miniHomeRemark, onShareAppMessage: function() {
imageUrl: this.miniHomeImg, return {
path: "pages/home/index?spread=" + uni.getStorageSync("uid"), title: this.miniHomeRemark,
}; imageUrl: this.miniHomeImg,
}, path: 'pages/home/index?spread=' + uni.getStorageSync('uid'),
goRoll(item) { }
if (item.uniapp_url) { },
this.$yrouter.push(item.uniapp_url); goRoll(item) {
} if (item.uniapp_url) {
}, this.$yrouter.push(item.uniapp_url)
goGoodSearch() { }
// this.$yrouter.push('/pages/shop/GoodsEvaluate/index'); },
this.$yrouter.push("/pages/shop/GoodSearch/index"); goGoodSearch() {
}, // this.$yrouter.push('/pages/shop/GoodsEvaluate/index');
goWxappUrl(item) { this.$yrouter.push('/pages/shop/GoodSearch/index')
this.$yrouter.push(item.uniapp_url); },
}, goWxappUrl(item) {
goHotNewGoods(type) { this.$yrouter.push(item.uniapp_url)
this.$yrouter.push({ },
path: "/pages/shop/HotNewGoods/index", goHotNewGoods(type) {
query: { this.$yrouter.push({
type, path: '/pages/shop/HotNewGoods/index',
}, query: {
}); type,
}, },
goGoodsCon(item) { })
this.$yrouter.push({ },
path: "/pages/shop/GoodsCon/index", goGoodsCon(item) {
query: { this.$yrouter.push({
id: item.id, path: '/pages/shop/GoodsCon/index',
}, query: {
}); id: item.id,
}, },
goGoodsPromotion() { })
this.$yrouter.push("/pages/shop/GoodsPromotion/index"); },
}, goGoodsPromotion() {
setOpenShare: function() { this.$yrouter.push('/pages/shop/GoodsPromotion/index')
if (this.$deviceType == "weixin") { },
getShare().then((res) => { setOpenShare: function() {
var data = res.data.data; if (this.$deviceType == 'weixin') {
var configAppMessage = { getShare().then(res => {
desc: data.synopsis, var data = res.data.data
title: data.title, var configAppMessage = {
link: location.href, desc: data.synopsis,
imgUrl: data.img, title: data.title,
}; link: location.href,
openShareAll(configAppMessage); imgUrl: data.img,
}); }
} openShareAll(configAppMessage)
}, })
startQr: function() { }
uni.scanCode({ },
success: (res) => { startQr: function() {
let option = handleUrlParam(res.result); uni.scanCode({
switch (option.pageType) { success: res => {
case "good": let option = handleUrlParam(res.result)
// 跳转商品详情 switch (option.pageType) {
this.$yrouter.push({ case 'good':
path: "/pages/shop/GoodsCon/index", // 跳转商品详情
query: { this.$yrouter.push({
q: res.result, path: '/pages/shop/GoodsCon/index',
}, query: {
}); q: res.result,
break; },
case "group": })
// 跳转团购 break
this.$yrouter.push({ case 'group':
path: "/pages/activity/GroupRule/index", // 跳转团购
query: { this.$yrouter.push({
q: res.result, path: '/pages/activity/GroupRule/index',
}, query: {
}); q: res.result,
break; },
case "dargain": })
// 跳转砍价 break
this.$yrouter.push({ case 'dargain':
path: "/pages/activity/DargainDetails/index", // 跳转砍价
query: { this.$yrouter.push({
q: res.result, path: '/pages/activity/DargainDetails/index',
}, query: {
}); q: res.result,
break; },
default: })
// 跳转分销 break
this.$yrouter.push({ default:
path: "/pages/Loading/index", // 跳转分销
query: {}, this.$yrouter.push({
}); path: '/pages/Loading/index',
break; query: {},
} })
}, break
}); }
}, },
getbgcolor(e) { })
this.bgcolor = e; },
}, getbgcolor(e) {
}, this.bgcolor = e
created: async function() { },
// await this.doColorThief(); },
}, created: async function() {
}; // await this.doColorThief();
},
}
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.content_box { .content_box {
background: #f6f6f6; background: #f6f6f6;
} }
.index { .index {
background-color: #f6f6f6; background-color: #f6f6f6;
} }
.swiper-item { .swiper-item {
height: 100%; height: 100%;
} }
.fixed-header { .fixed-header {
position: fixed; position: fixed;
z-index: 99; z-index: 99;
// #ifdef H5 // #ifdef H5
top: 88rpx; top: 88rpx;
// #endif // #endif
// #ifndef H5 // #ifndef H5
top: 0; top: 0;
// #endif // #endif
left: 0; left: 0;
right: 0; right: 0;
background: #fff; background: #fff;
box-shadow: 0 0 20rpx -10rpx #aaa; box-shadow: 0 0 20rpx -10rpx #aaa;
&+.fixed-header-box { & + .fixed-header-box {
height: 98rpx; height: 98rpx;
} }
} }
.head_box { .head_box {
width: 750rpx; width: 750rpx;
// background: #fff; // background: #fff;
transition: all linear 0.3s; transition: all linear 0.3s;
/deep/.cuIcon-back { /deep/.cuIcon-back {
display: none; display: none;
} }
.nav-title { .nav-title {
font-size: 38rpx; font-size: 38rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #fff; color: #fff;
} }
} }
.cu-bar.fixed { .cu-bar.fixed {
position: fixed; position: fixed;
width: 100%; width: 100%;
top: 0; top: 0;
z-index: 1024; z-index: 1024;
// box-shadow: 0 1upx 6upx rgba(0, 0, 0, 0.1); // box-shadow: 0 1upx 6upx rgba(0, 0, 0, 0.1);
} }
.cu-bar { .cu-bar {
box-sizing: border-box; box-sizing: border-box;
.index .header { .index .header {
height: 64rpx; height: 64rpx;
// width: 100%; // width: 100%;
// padding: 0 30rpx; // padding: 0 30rpx;
// box-sizing: border-box; // box-sizing: border-box;
} }
} }
.header-search { .header-search {
transition: all linear 0.3s; transition: all linear 0.3s;
} }
.cu-bar .action { .cu-bar .action {
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
align-items: center; align-items: center;
height: 100%; height: 100%;
max-height: 100%; max-height: 100%;
&:first-child { &:first-child {
margin-left: 15px; margin-left: 15px;
font-size: 15px; font-size: 15px;
} }
} }
.home_content_box { .home_content_box {
margin-top: -20rpx; margin-top: -20rpx;
} }
.head_box {} .head_box {
}
.nav-title { .nav-title {
margin-left: 20rpx; margin-left: 20rpx;
line-height: 40px; line-height: 40px;
} }
</style> </style>
pages/order/MyOrder/index.vue
+92 -127
View File
@@ -4,7 +4,7 @@
<view class="picTxt acea-row row-between-wrapper"> <view class="picTxt acea-row row-between-wrapper">
<view class="text"> <view class="text">
<view class="name">订单信息</view> <view class="name">订单信息</view>
<view>累计订单：{{ orderData.orderCount || 0 }} 总消费：￥{{orderData.sumPrice || 0 }}</view> <view>累计订单：{{ orderData.orderCount || 0 }} 总消费：￥{{ orderData.sumPrice || 0 }}</view>
</view> </view>
</view> </view>
</view> </view>
@@ -31,13 +31,10 @@
</view> </view>
</view> </view>
<view class="list"> <view class="list">
<view class="item" v-for="(order,orderListIndex) in orderList" :key="orderListIndex"> <view class="item" v-for="(order, orderListIndex) in orderList" :key="orderListIndex">
<view class="title acea-row row-between-wrapper"> <view class="title acea-row row-between-wrapper">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<span <span class="sign cart-color acea-row row-center-wrapper" v-if="order.combinationId > 0">拼团</span>
class="sign cart-color acea-row row-center-wrapper"
v-if="order.combinationId > 0"
>拼团</span>
<span class="sign cart-color acea-row row-center-wrapper" v-if="order.seckillId > 0">秒杀</span> <span class="sign cart-color acea-row row-center-wrapper" v-if="order.seckillId > 0">秒杀</span>
<span class="sign cart-color acea-row row-center-wrapper" v-if="order.bargainId > 0">砍价</span> <span class="sign cart-color acea-row row-center-wrapper" v-if="order.bargainId > 0">砍价</span>
<span class="sign cart-color acea-row row-center-wrapper" v-if="order.storeId > 0">门店</span> <span class="sign cart-color acea-row row-center-wrapper" v-if="order.storeId > 0">门店</span>
@@ -46,24 +43,15 @@
<view class="font-color-red">{{ getStatus(order) }}</view> <view class="font-color-red">{{ getStatus(order) }}</view>
</view> </view>
<view @click="goOrderDetails(order)"> <view @click="goOrderDetails(order)">
<view <view class="item-info acea-row row-between row-top" v-for="(cart, cartInfoIndex) in order.cartInfo" :key="cartInfoIndex">
class="item-info acea-row row-between row-top"
v-for="(cart,cartInfoIndex) in order.cartInfo"
:key="cartInfoIndex"
>
<view class="pictrue"> <view class="pictrue">
<image <image :src="cart.productInfo.image" @click.stop="$yrouter.push({ path: '/pages/shop/GoodsCon/index', query: { id: cart.productInfo.id } })" v-if="cart.combinationId === 0 && cart.bargainId === 0 && cart.seckillId === 0" />
:src="cart.productInfo.image"
@click.stop="
$yrouter.push({ path: '/pages/shop/GoodsCon/index',query:{id:cart.productInfo.id} })
"
v-if="cart.combinationId === 0 && cart.bargainId === 0 &&cart.seckillId === 0"
/>
<image <image
:src="cart.productInfo.image" :src="cart.productInfo.image"
@click.stop=" @click.stop="
$yrouter.push({ $yrouter.push({
path: '/pages/activity/GroupDetails/index',query:{id:cart.combinationId} path: '/pages/activity/GroupDetails/index',
query: { id: cart.combinationId },
}) })
" "
v-else-if="cart.combinationId > 0" v-else-if="cart.combinationId > 0"
@@ -72,7 +60,8 @@
:src="cart.productInfo.image" :src="cart.productInfo.image"
@click.stop=" @click.stop="
$yrouter.push({ $yrouter.push({
path: '/pages/activity/DargainDetails/index',query:{id:cart.bargainId} path: '/pages/activity/DargainDetails/index',
query: { id: cart.bargainId },
}) })
" "
v-else-if="cart.bargainId > 0" v-else-if="cart.bargainId > 0"
@@ -81,7 +70,8 @@
:src="cart.productInfo.image" :src="cart.productInfo.image"
@click.stop=" @click.stop="
$yrouter.push({ $yrouter.push({
path: '/pages/activity/SeckillDetails/index',query:{id:cart.seckillId} path: '/pages/activity/SeckillDetails/index',
query: { id: cart.seckillId },
}) })
" "
v-else-if="cart.seckillId > 0" v-else-if="cart.seckillId > 0"
@@ -90,16 +80,8 @@
<view class="text acea-row row-between"> <view class="text acea-row row-between">
<view class="name line2">{{ cart.productInfo.storeName }}</view> <view class="name line2">{{ cart.productInfo.storeName }}</view>
<view class="money"> <view class="money">
<view v-if="order.payType!='integral'"> <view v-if="order.payType != 'integral'"> ￥{{ cart.productInfo.attrInfo ? cart.productInfo.attrInfo.price : cart.productInfo.price }} </view>
￥{{ <view v-if="order.payType == 'integral'"> {{ order.payIntegral }}积分 </view>
cart.productInfo.attrInfo
? cart.productInfo.attrInfo.price
: cart.productInfo.price
}}
</view>
<view v-if="order.payType=='integral'">
{{order.payIntegral}}积分
</view>
<view>x{{ cart.cartNum }}</view> <view>x{{ cart.cartNum }}</view>
</view> </view>
</view> </view>
@@ -107,8 +89,8 @@
</view> </view>
<view class="totalPrice"> <view class="totalPrice">
共{{ order.cartInfo.length || 0 }}件商品，总金额 共{{ order.cartInfo.length || 0 }}件商品，总金额
<text class="money font-color-red" v-if="order.payType!='integral'">￥{{ order.payPrice }}</text> <text class="money font-color-red" v-if="order.payType != 'integral'">￥{{ order.payPrice }}</text>
<text class="money font-color-red" v-if="order.payType=='integral'">{{order.payIntegral}}积分</text> <text class="money font-color-red" v-if="order.payType == 'integral'">{{ order.payIntegral }}积分</text>
</view> </view>
<view class="bottom acea-row row-right row-middle"> <view class="bottom acea-row row-right row-middle">
<template v-if="order._status._type == 0"> <template v-if="order._status._type == 0">
@@ -150,32 +132,17 @@
</view> </view>
</template> </template>
<script> <script>
import { getOrderData, getOrderList } from "@/api/order"; import { getOrderData, getOrderList } from '@/api/order'
import { import { cancelOrderHandle, payOrderHandle, takeOrderHandle } from '@/libs/order'
cancelOrderHandle, import Loading from '@/components/Loading'
payOrderHandle, import Payment from '@/components/Payment'
takeOrderHandle import DataFormat from '@/components/DataFormat'
} from "@/libs/order"; import { mapGetters } from 'vuex'
import Loading from "@/components/Loading"; import { isWeixin, dataFormat } from '@/utils'
import Payment from "@/components/Payment";
import DataFormat from "@/components/DataFormat";
import { mapGetters } from "vuex";
import { isWeixin, dataFormat } from "@/utils";
const STATUS = [ const STATUS = ['待付款', '待发货', '待收货', '待评价', '已完成', '', '', '', '', '待付款']
"待付款",
"待发货",
"待收货",
"待评价",
"已完成",
"",
"",
"",
"",
"待付款"
];
const NAME = "MyOrder"; const NAME = 'MyOrder'
export default { export default {
name: NAME, name: NAME,
@@ -183,139 +150,137 @@ export default {
return { return {
offlinePayStatus: 2, offlinePayStatus: 2,
orderData: {}, orderData: {},
type: "", type: '',
page: 1, page: 1,
limit: 20, limit: 20,
loaded: false, loaded: false,
loading: false, loading: false,
orderList: [], orderList: [],
pay: false, pay: false,
payType: ["yue", "weixin"], payType: ['yue', 'weixin'],
from: this.$deviceType from: this.$deviceType,
}; }
}, },
components: { components: {
Loading, Loading,
Payment, Payment,
DataFormat DataFormat,
}, },
computed: mapGetters(["userInfo"]), computed: mapGetters(['userInfo']),
onShow: function() { onShow: function() {
console.log(this); console.log(this)
this.type = parseInt(this.$yroute.query.type) || 0; this.type = parseInt(this.$yroute.query.type) || 0
this.changeType(this.type); this.changeType(this.type)
this.getOrderData(); this.getOrderData()
this.getOrderList(); this.getOrderList()
}, },
onHide: function() { onHide: function() {
this.orderList = []; this.orderList = []
this.page = 1; this.page = 1
this.limit = 20; this.limit = 20
this.loaded = false; this.loaded = false
this.loading = false; this.loading = false
}, },
methods: { methods: {
goLogistics(order) { goLogistics(order) {
this.$yrouter.push({ this.$yrouter.push({
path: "/pages/order/Logistics/index", path: '/pages/order/Logistics/index',
query: { id: order.orderId } query: { id: order.orderId },
}); })
}, },
goOrderDetails(order) { goOrderDetails(order) {
this.$yrouter.push({ this.$yrouter.push({
path: "/pages/order/OrderDetails/index", path: '/pages/order/OrderDetails/index',
query: { id: order.orderId } query: { id: order.orderId },
}); })
}, },
dataFormat, dataFormat,
setOfflinePayStatus: function(status) { setOfflinePayStatus: function(status) {
var that = this; var that = this
that.offlinePayStatus = status; that.offlinePayStatus = status
if (status === 1) { if (status === 1) {
if (that.payType.indexOf("offline") < 0) { if (that.payType.indexOf('offline') < 0) {
that.payType.push("offline"); that.payType.push('offline')
} }
} }
}, },
getOrderData() { getOrderData() {
getOrderData().then(res => { getOrderData().then(res => {
this.orderData = res.data; this.orderData = res.data
}); })
}, },
takeOrder(order) { takeOrder(order) {
takeOrderHandle(order.orderId).finally(() => { takeOrderHandle(order.orderId).finally(() => {
this.reload(); this.reload()
this.getOrderData(); this.getOrderData()
}); })
}, },
reload() { reload() {
this.changeType(this.type); this.changeType(this.type)
}, },
changeType(type) { changeType(type) {
this.type = type; this.type = type
this.orderList = []; this.orderList = []
this.page = 1; this.page = 1
this.loaded = false; this.loaded = false
this.loading = false; this.loading = false
this.getOrderList(); this.getOrderList()
}, },
getOrderList() { getOrderList() {
if (this.loading || this.loaded) return; if (this.loading || this.loaded) return
this.loading = true; this.loading = true
const { page, limit, type } = this; const { page, limit, type } = this
getOrderList({ getOrderList({
page, page,
limit, limit,
type type,
}).then(res => { }).then(res => {
this.orderList = this.orderList.concat(res.data); this.orderList = this.orderList.concat(res.data)
this.page++; this.page++
this.loaded = res.data.length < this.limit; this.loaded = res.data.length < this.limit
this.loading = false; this.loading = false
}); })
}, },
getStatus(order) { getStatus(order) {
return STATUS[order._status._type]; return STATUS[order._status._type]
}, },
cancelOrder(order) { cancelOrder(order) {
cancelOrderHandle(order.orderId) cancelOrderHandle(order.orderId)
.then(() => { .then(() => {
this.getOrderData(); this.getOrderData()
this.orderList.splice(this.orderList.indexOf(order), 1); this.orderList.splice(this.orderList.indexOf(order), 1)
}) })
.catch(() => { .catch(() => {
this.reload(); this.reload()
}); })
}, },
paymentTap: function(order) { paymentTap: function(order) {
var that = this; var that = this
if ( if (!(order.combinationId > 0 || order.bargainId > 0 || order.seckillId > 0)) {
!(order.combinationId > 0 || order.bargainId > 0 || order.seckillId > 0) that.setOfflinePayStatus(order.offlinePayStatus)
) {
that.setOfflinePayStatus(order.offlinePayStatus);
} }
this.pay = true; this.pay = true
this.toPay = type => { this.toPay = type => {
payOrderHandle(order.orderId, type, that.from) payOrderHandle(order.orderId, type, that.from)
.then(() => { .then(() => {
const type = parseInt(this.$yroute.query.type) || 0; const type = parseInt(this.$yroute.query.type) || 0
that.changeType(type); that.changeType(type)
that.getOrderData(); that.getOrderData()
}) })
.catch(() => { .catch(() => {
const type = parseInt(that.$yroute.query.type) || 0; const type = parseInt(that.$yroute.query.type) || 0
that.changeType(type); that.changeType(type)
that.getOrderData(); that.getOrderData()
}); })
}; }
}, },
toPay() {} toPay() {},
}, },
mounted() {}, mounted() {},
onReachBottom() { onReachBottom() {
!this.loading && this.getOrderList(); !this.loading && this.getOrderList()
} },
}; }
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
pages/orderAdmin/OrderCancellation/index.vue
+175 -182
View File
@@ -1,200 +1,193 @@
<template> <template>
<view class="OrderCancellation"> <view class="OrderCancellation">
<view class="header"> <view class="header">
<image mode="aspectFit" :src="`${$VUE_APP_RESOURCES_URL}/images/writeOffBg.jpg`" @click="openQRCode" /> <image mode="aspectFit" :src="`${$VUE_APP_RESOURCES_URL}/images/writeOffBg.jpg`" @click="openQRCode" />
</view> </view>
<view class="whiteBg"> <view class="whiteBg">
<view class="input"> <view class="input">
<input type="number" placeholder="0" v-model="verify_code" /> <input type="number" placeholder="0" v-model="verify_code" />
</view> </view>
<view class="bnt" @click="storeCancellation">立即核销</view> <view class="bnt" @click="storeCancellation">立即核销</view>
<view class="bnt" @click="openQRCode">扫码核销</view> <view class="bnt" v-if="$deviceType !== 'weixin'" @click="openQRCode">扫码核销</view>
</view> </view>
<!-- #ifndef H5 --> <!-- #ifndef H5 -->
<!-- <view class="scan" v-if="iswechat"> <!-- <view class="scan" v-if="iswechat">
<image :src="`${$VUE_APP_RESOURCES_URL}/images/scan.gif`" @click="openQRCode" /> <image :src="`${$VUE_APP_RESOURCES_URL}/images/scan.gif`" @click="openQRCode" />
</view> --> </view> -->
<!-- #endif --> <!-- #endif -->
<WriteOff :iShidden="iShidden" :orderInfo="orderInfo" @cancel="cancel" @confirm="confirm"></WriteOff> <WriteOff :iShidden="iShidden" :orderInfo="orderInfo" @cancel="cancel" @confirm="confirm"></WriteOff>
</view> </view>
</template> </template>
<script> <script>
import WriteOff from "@/components/WriteOff"; import WriteOff from '@/components/WriteOff'
import { import { isWeixin } from '@/utils'
isWeixin // import { wechatEvevt } from "@/libs/wechat";
} from "@/utils"; import { orderVerific } from '@/api/order'
// import { wechatEvevt } from "@/libs/wechat"; const NAME = 'OrderCancellation'
import {
orderVerific
} from "@/api/order";
const NAME = "OrderCancellation";
export default { export default {
name: NAME, name: NAME,
components: { components: {
WriteOff WriteOff,
}, },
props: {}, props: {},
data: function() { data: function() {
return { return {
iShidden: true, iShidden: true,
orderInfo: {}, orderInfo: {},
verify_code: "" verify_code: '',
}; }
}, },
mounted: function() {}, mounted: function() {},
methods: { methods: {
cancel: function(res) { cancel: function(res) {
this.iShidden = res; this.iShidden = res
}, },
confirm: function() { confirm: function() {
orderVerific(this.verify_code, 1) orderVerific(this.verify_code, 1)
.then(res => { .then(res => {
this.iShidden = true; this.iShidden = true
this.verify_code = ""; this.verify_code = ''
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
icon: "none", icon: 'none',
duration: 2000 duration: 2000,
}); })
}) })
.catch(err => { .catch(err => {
uni.showToast({ uni.showToast({
title: err.msg || err.response.data.msg || err.response.data.message, title: err.msg || err.response.data.msg || err.response.data.message,
icon: "none", icon: 'none',
duration: 2000 duration: 2000,
}); })
}); })
}, },
storeCancellation: function() { storeCancellation: function() {
let ref = /[0-9]{12}/; let ref = /[0-9]{12}/
if (!this.verify_code) { if (!this.verify_code) {
uni.showToast({ uni.showToast({
title: "请输入核销码", title: '请输入核销码',
icon: "none", icon: 'none',
duration: 2000 duration: 2000,
}); })
return; return
} }
if (!ref.test(this.verify_code)) { if (!ref.test(this.verify_code)) {
uni.showToast({ uni.showToast({
title: "请输入正确的核销码", title: '请输入正确的核销码',
icon: "none", icon: 'none',
duration: 2000 duration: 2000,
}); })
return; return
} }
uni.showLoading({ uni.showLoading({
title: "查询中" title: '查询中',
}); })
orderVerific(this.verify_code, 0) orderVerific(this.verify_code, 0)
.then(res => { .then(res => {
uni.hideLoading(); uni.hideLoading()
this.orderInfo = res.data; this.orderInfo = res.data
this.iShidden = false; this.iShidden = false
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
icon: "success", icon: 'success',
duration: 2000 duration: 2000,
}); })
}) })
.catch(error => { .catch(error => {
uni.hideLoading(); uni.hideLoading()
uni.showToast({ uni.showToast({
title: error.msg || title: error.msg || error.response.data.msg || error.response.data.message,
error.response.data.msg || icon: 'none',
error.response.data.message, duration: 2000,
icon: "none", })
duration: 2000 })
}); },
}); openQRCode: function() {
}, let that = this
openQRCode: function() { // 这里需要调用扫码功能
let that = this; uni.scanCode({
// 这里需要调用扫码功能 success: res => {
uni.scanCode({ var result = res.result
success: (res) => { if (result) {
var result = res.result; that.verify_code = res.result
if (result) { that.storeCancellation()
that.verify_code = res.result; } else {
that.storeCancellation(); uni.showToast({
} else { title: '没有扫描到什么！',
uni.showToast({ icon: 'none',
title: '没有扫描到什么！', duration: 2000,
icon: "none", })
duration: 2000 }
}); },
} })
} },
}) },
}
}
}
};
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.OrderCancellation .header { .OrderCancellation .header {
width: 100%; width: 100%;
height: 3 * 100rpx; height: 3 * 100rpx;
background-size: 100% 100%; background-size: 100% 100%;
image { image {
width: 100%; width: 100%;
height: 3 * 100rpx; height: 3 * 100rpx;
} }
} }
.OrderCancellation .whiteBg { .OrderCancellation .whiteBg {
width: 6.9 * 100rpx; width: 6.9 * 100rpx;
background-color: #fff; background-color: #fff;
margin: -0.93 * 100rpx auto 0 auto; margin: -0.93 * 100rpx auto 0 auto;
padding-top: 0.8 * 100rpx; padding-top: 0.8 * 100rpx;
padding-bottom: 30rpx; padding-bottom: 30rpx;
z-index: 20; z-index: 20;
position: relative; position: relative;
border-radius: 0.06 * 100rpx 0.06 * 100rpx 0 0; border-radius: 0.06 * 100rpx 0.06 * 100rpx 0 0;
} }
.OrderCancellation .whiteBg .input { .OrderCancellation .whiteBg .input {
width: 5.8 * 100rpx; width: 5.8 * 100rpx;
margin: 0 auto; margin: 0 auto;
border-bottom: 0.01 * 100rpx solid #eee; border-bottom: 0.01 * 100rpx solid #eee;
} }
.OrderCancellation .whiteBg .input input { .OrderCancellation .whiteBg .input input {
padding-bottom: 0.25 * 100rpx; padding-bottom: 0.25 * 100rpx;
font-size: 0.6 * 100rpx; font-size: 0.6 * 100rpx;
height: auto; height: auto;
color: #282828; color: #282828;
width: 100%; width: 100%;
text-align: center; text-align: center;
} }
.OrderCancellation .whiteBg .bnt { .OrderCancellation .whiteBg .bnt {
font-size: 0.32 * 100rpx; font-size: 0.32 * 100rpx;
color: #fff; color: #fff;
width: 5.8 * 100rpx; width: 5.8 * 100rpx;
height: 0.86 * 100rpx; height: 0.86 * 100rpx;
border-radius: 0.43 * 100rpx; border-radius: 0.43 * 100rpx;
background-image: linear-gradient(to right, #eb3729 0%, #eb3729 100%); background-image: linear-gradient(to right, #eb3729 0%, #eb3729 100%);
background-image: -webkit-linear-gradient(to right, #eb3729 0%, #eb3729 100%); background-image: -webkit-linear-gradient(to right, #eb3729 0%, #eb3729 100%);
background-image: -moz-linear-gradient(to right, #eb3729 0%, #eb3729 100%); background-image: -moz-linear-gradient(to right, #eb3729 0%, #eb3729 100%);
text-align: center; text-align: center;
line-height: 0.86 * 100rpx; line-height: 0.86 * 100rpx;
margin: 0.55 * 100rpx auto 0 auto; margin: 0.55 * 100rpx auto 0 auto;
} }
.OrderCancellation .scan { .OrderCancellation .scan {
width: 3 * 100rpx; width: 3 * 100rpx;
height: 3 * 100rpx; height: 3 * 100rpx;
margin: 1.1 * 100rpx auto 0 auto; margin: 1.1 * 100rpx auto 0 auto;
} }
.OrderCancellation .scan image { .OrderCancellation .scan image {
width: 100%; width: 100%;
height: 100%; height: 100%;
display: block; display: block;
} }
</style> </style>
pages/shop/GoodsCollection/index.vue
+47 -48
View File
@@ -1,30 +1,22 @@
<template> <template>
<view ref="container"> <view ref="container">
<view class="collectionGoods" v-if="collectProductList.length > 0"> <view class="collectionGoods" v-if="collectProductList.length > 0">
<view <view class="item acea-row row-between-wrapper" v-for="(item, collectProductListIndex) in collectProductList" :key="collectProductListIndex" @click="goGoodsCon(item)">
class="item acea-row row-between-wrapper"
v-for="(item, collectProductListIndex) in collectProductList"
:key="collectProductListIndex"
@click="goGoodsCon(item)"
>
<view class="pictrue"> <view class="pictrue">
<image :src="item.image" /> <image :src="item.image" />
</view> </view>
<view class="text acea-row row-column-between"> <view class="text acea-row row-column-between">
<view class="infor line1">{{ item.storeName }}</view> <view class="infor line1">{{ item.storeName }}</view>
<view class="acea-row row-between-wrapper"> <view class="acea-row row-between-wrapper">
<view class="money font-color-red">￥{{ item.price }}</view> <view class="money font-color-red" v-if="isIntegral == 1">{{ item.costPrice }}积分</view>
<view class="money font-color-red" v-else>￥{{ item.price }}</view>
<view class="delete" @tap.stop="delCollection(collectProductListIndex)">删除</view> <view class="delete" @tap.stop="delCollection(collectProductListIndex)">删除</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<Loading :loaded="loadend" :loading="loading"></Loading> <Loading :loaded="loadend" :loading="loading"></Loading>
<view <view class="noCommodity" style="background-color:#fff;" v-if="collectProductList.length < 1 && page > 1">
class="noCommodity"
style="background-color:#fff;"
v-if="collectProductList.length < 1 && page > 1"
>
<view class="noPictrue"> <view class="noPictrue">
<image :src="`${$VUE_APP_RESOURCES_URL}/images/noCollection.png`" class="image" /> <image :src="`${$VUE_APP_RESOURCES_URL}/images/noCollection.png`" class="image" />
</view> </view>
@@ -33,70 +25,77 @@
</view> </view>
</template> </template>
<script> <script>
import Recommend from "@/components/Recommend"; import Recommend from '@/components/Recommend'
import { getCollectUser, getCollectDel } from "@/api/user"; import { getCollectUser, getCollectDel } from '@/api/user'
import Loading from "@/components/Loading"; import Loading from '@/components/Loading'
export default { export default {
name: "GoodsCollection", name: 'GoodsCollection',
components: { components: {
Recommend, Recommend,
Loading Loading,
}, },
props: {}, props: {},
data: function() { data: function() {
return { return {
page: 1, page: 1,
limit: 20, limit: 20,
type:'collect', type: 'collect',
collectProductList: [], collectProductList: [],
loadTitle: "", loadTitle: '',
loading: false, loading: false,
loadend: false loadend: false,
}; }
}, },
mounted: function() { mounted: function() {
this.get_user_collect_product(); this.get_user_collect_product()
}, },
onReachBottom() { onReachBottom() {
!this.loading && this.get_user_collect_product(); !this.loading && this.get_user_collect_product()
}, },
methods: { methods: {
goGoodsCon(item) { goGoodsCon(item) {
this.$yrouter.push({ if (item.isIntegral == 1) {
path: "/pages/shop/GoodsCon/index", this.$yrouter.push({
query: { id: item.pid } path: '/pages/shop/GoodsCon/index',
}); query: { id: item.pid },
})
} else {
this.$yrouter.push({
path: '/pages/shop/GoodsCon/index',
query: { id: item.pid },
})
}
}, },
get_user_collect_product: function() { get_user_collect_product: function() {
let that = this; let that = this
if (that.loading) return; //阻止下次请求（false可以进行请求）； if (that.loading) return //阻止下次请求（false可以进行请求）；
if (that.loadend) return; //阻止结束当前请求（false可以进行请求）； if (that.loadend) return //阻止结束当前请求（false可以进行请求）；
that.loading = true; that.loading = true
getCollectUser(that.page, that.limit,that.type).then(res => { getCollectUser(that.page, that.limit, that.type).then(res => {
that.loading = false; that.loading = false
//apply();js将一个数组插入另一个数组; //apply();js将一个数组插入另一个数组;
that.collectProductList.push.apply(that.collectProductList, res.data); that.collectProductList.push.apply(that.collectProductList, res.data)
that.loadend = res.data.length < that.limit; //判断所有数据是否加载完成； that.loadend = res.data.length < that.limit //判断所有数据是否加载完成；
that.page = that.page + 1; that.page = that.page + 1
}); })
}, },
//删除收藏； //删除收藏；
delCollection: function(index) { delCollection: function(index) {
let that = this, let that = this,
id = that.collectProductList[index].pid, id = that.collectProductList[index].pid,
category = that.collectProductList[index].category; category = that.collectProductList[index].category
getCollectDel(id, category).then(function() { getCollectDel(id, category).then(function() {
uni.showToast({ uni.showToast({
title: "删除成功", title: '删除成功',
icon: "success", icon: 'success',
duration: 2000, duration: 2000,
complete: () => { complete: () => {
that.collectProductList.splice(index, 1); that.collectProductList.splice(index, 1)
that.$set(that, "collectProductList", that.collectProductList); that.$set(that, 'collectProductList', that.collectProductList)
} },
}); })
}); })
} },
} },
}; }
</script> </script>
pages/shop/GoodsFoot/index.vue
+47 -48
View File
@@ -1,30 +1,22 @@
<template> <template>
<view ref="container"> <view ref="container">
<view class="collectionGoods" v-if="collectProductList.length > 0"> <view class="collectionGoods" v-if="collectProductList.length > 0">
<view <view class="item acea-row row-between-wrapper" v-for="(item, collectProductListIndex) in collectProductList" :key="collectProductListIndex" @click="goGoodsCon(item)">
class="item acea-row row-between-wrapper"
v-for="(item, collectProductListIndex) in collectProductList"
:key="collectProductListIndex"
@click="goGoodsCon(item)"
>
<view class="pictrue"> <view class="pictrue">
<image :src="item.image" /> <image :src="item.image" />
</view> </view>
<view class="text acea-row row-column-between"> <view class="text acea-row row-column-between">
<view class="infor line1">{{ item.storeName }}</view> <view class="infor line1">{{ item.storeName }}</view>
<view class="acea-row row-between-wrapper"> <view class="acea-row row-between-wrapper">
<view class="money font-color-red">￥{{ item.price }}</view> <view class="money font-color-red" v-if="isIntegral == 1">{{ item.costPrice }}积分</view>
<view class="money font-color-red" v-else>￥{{ item.price }}</view>
<view class="delete" @tap.stop="delCollection(collectProductListIndex)">删除</view> <view class="delete" @tap.stop="delCollection(collectProductListIndex)">删除</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<Loading :loaded="loadend" :loading="loading"></Loading> <Loading :loaded="loadend" :loading="loading"></Loading>
<view <view class="noCommodity" style="background-color:#fff;" v-if="collectProductList.length < 1 && page > 1">
class="noCommodity"
style="background-color:#fff;"
v-if="collectProductList.length < 1 && page > 1"
>
<view class="noPictrue"> <view class="noPictrue">
<image :src="`${$VUE_APP_RESOURCES_URL}/images/noCollection.png`" class="image" /> <image :src="`${$VUE_APP_RESOURCES_URL}/images/noCollection.png`" class="image" />
</view> </view>
@@ -33,70 +25,77 @@
</view> </view>
</template> </template>
<script> <script>
import Recommend from "@/components/Recommend"; import Recommend from '@/components/Recommend'
import { getCollectUser, getCollectDel } from "@/api/user"; import { getCollectUser, getCollectDel } from '@/api/user'
import Loading from "@/components/Loading"; import Loading from '@/components/Loading'
export default { export default {
name: "GoodsFoot", name: 'GoodsFoot',
components: { components: {
Recommend, Recommend,
Loading Loading,
}, },
props: {}, props: {},
data: function() { data: function() {
return { return {
page: 1, page: 1,
limit: 20, limit: 20,
type:'foot', type: 'foot',
collectProductList: [], collectProductList: [],
loadTitle: "", loadTitle: '',
loading: false, loading: false,
loadend: false loadend: false,
}; }
}, },
mounted: function() { mounted: function() {
this.get_user_collect_product(); this.get_user_collect_product()
}, },
onReachBottom() { onReachBottom() {
!this.loading && this.get_user_collect_product(); !this.loading && this.get_user_collect_product()
}, },
methods: { methods: {
goGoodsCon(item) { goGoodsCon(item) {
this.$yrouter.push({ if (item.isIntegral == 1) {
path: "/pages/shop/GoodsCon/index", this.$yrouter.push({
query: { id: item.pid } path: '/pages/shop/GoodsCon/index',
}); query: { id: item.pid },
})
} else {
this.$yrouter.push({
path: '/pages/shop/GoodsCon/index',
query: { id: item.pid },
})
}
}, },
get_user_collect_product: function() { get_user_collect_product: function() {
let that = this; let that = this
if (that.loading) return; //阻止下次请求（false可以进行请求）； if (that.loading) return //阻止下次请求（false可以进行请求）；
if (that.loadend) return; //阻止结束当前请求（false可以进行请求）； if (that.loadend) return //阻止结束当前请求（false可以进行请求）；
that.loading = true; that.loading = true
getCollectUser(that.page, that.limit,that.type).then(res => { getCollectUser(that.page, that.limit, that.type).then(res => {
that.loading = false; that.loading = false
//apply();js将一个数组插入另一个数组; //apply();js将一个数组插入另一个数组;
that.collectProductList.push.apply(that.collectProductList, res.data); that.collectProductList.push.apply(that.collectProductList, res.data)
that.loadend = res.data.length < that.limit; //判断所有数据是否加载完成； that.loadend = res.data.length < that.limit //判断所有数据是否加载完成；
that.page = that.page + 1; that.page = that.page + 1
}); })
}, },
//删除收藏； //删除收藏；
delCollection: function(index) { delCollection: function(index) {
let that = this, let that = this,
id = that.collectProductList[index].pid, id = that.collectProductList[index].pid,
category = that.collectProductList[index].category; category = that.collectProductList[index].category
getCollectDel(id, category).then(function() { getCollectDel(id, category).then(function() {
uni.showToast({ uni.showToast({
title: "删除成功", title: '删除成功',
icon: "success", icon: 'success',
duration: 2000, duration: 2000,
complete: () => { complete: () => {
that.collectProductList.splice(index, 1); that.collectProductList.splice(index, 1)
that.$set(that, "collectProductList", that.collectProductList); that.$set(that, 'collectProductList', that.collectProductList)
} },
}); })
}); })
} },
} },
}; }
</script> </script>
pages/user/UserAccount/index.vue
+29 -30
View File
@@ -8,7 +8,7 @@
<view>总资产(元)</view> <view>总资产(元)</view>
<view class="money">{{ now_money }}</view> <view class="money">{{ now_money }}</view>
</view> </view>
<navigator url="/pages/user/Recharge/index" class="recharge font-color-red" v-if="is_hide=='0'">充值</navigator> <navigator url="/pages/user/Recharge/index" class="recharge font-color-red" v-if="is_hide == '0'">充值</navigator>
</view> </view>
<view class="cumulative acea-row row-top"> <view class="cumulative acea-row row-top">
<view class="item"> <view class="item">
@@ -31,7 +31,7 @@
</view> </view>
<view>消费记录</view> <view>消费记录</view>
</view> </view>
<view class="item" @click="goUserBill(2)" v-if="is_hide=='0'"> <view class="item" @click="goUserBill(2)" v-if="is_hide == '0'">
<view class="pictrue"> <view class="pictrue">
<image :src="`${$VUE_APP_RESOURCES_URL}/images/record3.png`" /> <image :src="`${$VUE_APP_RESOURCES_URL}/images/record3.png`" />
</view> </view>
@@ -44,59 +44,58 @@
</view> </view>
</template> </template>
<script> <script>
import Recommend from "@/components/Recommend"; import Recommend from '@/components/Recommend'
import { getActivityStatus, getBalance } from "@/api/user"; import { getActivityStatus, getBalance } from '@/api/user'
export default { export default {
name: "UserAccount", name: 'UserAccount',
components: { components: {
Recommend Recommend,
}, },
props: {}, props: {},
data: function() { data: function() {
return { return {
is_hide: "1", is_hide: '1',
now_money: 0, now_money: 0,
orderStatusSum: 0, orderStatusSum: 0,
recharge: 0, recharge: 0,
activity: { activity: {
is_bargin: false, is_bargin: false,
is_pink: false, is_pink: false,
is_seckill: false is_seckill: false,
} },
}; }
}, },
onShow: function() { onShow: function() {
this.getIndex(); this.getIndex()
this.getActivity(); this.getActivity()
}, },
methods: { methods: {
goUserBill(types) { goUserBill(types) {
this.$yrouter.push({ this.$yrouter.push({
path: "/pages/user/UserBill/index", path: '/pages/user/UserBill/index',
query: { types } query: { types },
}); })
}, },
getIndex: function() { getIndex: function() {
let that = this; let that = this
getBalance().then( getBalance().then(
res => { res => {
that.now_money = res.data.now_money; that.now_money = res.data.now_money
that.orderStatusSum = res.data.orderStatusSum; that.orderStatusSum = res.data.orderStatusSum
that.recharge = res.data.recharge; that.recharge = res.data.recharge
this.is_hide = res.data.is_hide; this.is_hide = res.data.is_hide
}, },
err => { err => {
uni.showToast({ uni.showToast({
title: title: err.msg || err.response.data.msg || err.response.data.message,
err.msg || err.response.data.msg || err.response.data.message, icon: 'none',
icon: "none", duration: 2000,
duration: 2000 })
});
} }
); )
}, },
getActivity: function() { getActivity: function() {
let that = this; let that = this
// getActivityStatus().then( // getActivityStatus().then(
// res => { // res => {
// that.activity.is_bargin = res.data.is_bargin; // that.activity.is_bargin = res.data.is_bargin;
@@ -112,7 +111,7 @@ export default {
// }); // });
// } // }
// ); // );
} },
} },
}; }
</script> </script>
utils/index.js
+18 -2
View File
@@ -499,6 +499,22 @@ export const handleLoginStatus = (location, complete, fail, success) => {
path: '/pages/home/index', path: '/pages/home/index',
name: '首页', name: '首页',
}, },
{
path: '/pages/shop/HotNewGoods/index',
name: '热门榜单',
},
{
path: '/pages/activity/GoodsGroup/index',
name: '超值拼团',
},
{
path: '/pages/shop/Live/LiveList/index',
name: '热门直播',
},
{
path: '/pages/shop/GoodsClass/index',
name: '商品分类',
},
{ {
path: '/pages/user/Login/index', path: '/pages/user/Login/index',
name: '登录页面', name: '登录页面',
@@ -520,7 +536,7 @@ export const handleLoginStatus = (location, complete, fail, success) => {
} else { } else {
path = location.path path = location.path
} }
console.log(path)
// 判断用户是否有token // 判断用户是否有token
if (!handleAuth()) { if (!handleAuth()) {
page.map(item => { page.map(item => {
@@ -531,7 +547,7 @@ export const handleLoginStatus = (location, complete, fail, success) => {
} else { } else {
isAuth = true isAuth = true
} }
console.log(isAuth)
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (isAuth) { if (isAuth) {
// 有token // 有token