zhuce
/
lilishop-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

适配优化的sql，将平台id改为0

master
paulGao 2022-06-08 16:08:58 +08:00 committed by 学习很差啦
parent 5550285531
commit 3a705cce8e
6 changed files with 50 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
App.vue
View File

@ -5,7 +5,6 @@
import { mapMutations } from "vuex";
import APPUpdate from "@/plugins/APPUpdate";
import { getClipboardData } from "@/js_sdk/h5-copy/h5-copy.js";
<<<<<<< HEAD
import config from "@/config/config";
import storage from "@/utils/storage";
// 悬浮球

23
pages/cart/coupon/couponCenter.vue
View File

@ -1,9 +1,9 @@
<template>
<view class="coupon-center">
<div class="swiper-box">
<div class="swiper-item">
<div class="scroll-v" enableBackToTop="true" scroll-y>
<u-empty mode="coupon" style='margin-top: 20%;' text="没有优惠券了" v-if="whetherEmpty"></u-empty>
<swiper class="swiper-box">
<swiper-item class="swiper-item">
<scroll-view class="scroll-v" enableBackToTop="true" scroll-y @scrolltolower="loadMore">
<u-empty mode="coupon" text="没有优惠券了" v-if="whetherEmpty"></u-empty>
<view v-else class="coupon-item" v-for="(item, index) in couponList" :key="index">
<view class="left">
<view class="wave-line">
@ -23,11 +23,10 @@
<view class="right">
<view>
<!-- 根据scopeType 判断是否是 平台、品类或店铺 -->
<view class="coupon-title wes-3" v-if="item.scopeType">
<span v-if="item.scopeType == 'ALL' && item.id == 'platform'">全平台</span>
<view v-if="item.scopeType">
<span v-if="item.scopeType == 'ALL' && item.storeId == '0'">全平台</span>
<span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
<view v-else>{{ item.storeName == 'platform' ? '全平台' :item.storeName+'店铺' }}使用
</view>
<view v-else>{{ item.storeName == 'platform' ? '全平台' :item.storeName+'店铺' }}使用</view>
</view>
<view v-if="item.endTime">有效期至：{{ item.endTime.split(" ")[0] }}</view>
</view>
@ -38,10 +37,10 @@
<view class="bg-quan"> 券 </view>
</view>
</view>
</div>
</div>
</div>
<uni-load-more :status="loadStatus"></uni-load-more>
</scroll-view>
</swiper-item>
</swiper>
</view>
</template>

2
pages/cart/coupon/couponDetail.vue
View File

@ -14,7 +14,7 @@
</view>
<view class="bottom-view">
<view class="text">• 使用平台：{{
coupon.scopeType == 'ALL' && coupon.id == 'platform'
coupon.scopeType == 'ALL' && coupon.storeId == '0'
? "全平台"
: coupon.scopeType == "PORTION_CATEGORY"
? "仅限品类"

2
pages/cart/coupon/index.vue
View File

@ -34,7 +34,7 @@
<view class="right">
<view class="desc">
<view v-if="item.scopeType">
<span v-if="item.scopeType == 'ALL' && item.id == 'platform'">全平台</span>
<span v-if="item.scopeType == 'ALL' && item.storeId == '0'">全平台</span>
<span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
<view v-else
>{{

4
pages/cart/coupon/myCoupon.vue
View File

@ -32,7 +32,7 @@
<view class="content">
<view class="title-1">{{ coupon.title }}</view>
<view class="title-2">使用平台：{{
coupon.scopeType == 'ALL' && coupon.id == 'platform'
coupon.scopeType == 'ALL' && coupon.storeId == '0'
? "全平台"
: coupon.scopeType == "PORTION_CATEGORY"
? "仅限品类"
@ -188,7 +188,7 @@ export default {
* 立即使用优惠券
*/
useItNow(item) {
if (item.storeId && item.storeId!='platform') {
if (item.storeId && item.storeId!='0') {
uni.navigateTo({
url: `/pages/product/shopPage?id=${item.storeId}`,
});

2
pages/product/product/promotion/-promotion-coupon.vue
View File

@ -11,7 +11,7 @@
<view class="text">
<div class="coupon-List-title">
<view v-if="item.scopeType">
<span v-if="item.scopeType == 'ALL' && item.id == 'platform'">全平台</span>
<span v-if="item.scopeType == 'ALL' && item.storeId == '0'">全平台</span>
<span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
<view v-else>{{
item.storeName == "platform" ? "全平台" : item.storeName + "店铺"