Merge branch 'feat/appointment-goods'

pages/promotion/bargain/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="page">
+  <div :style="themeStyle" class="page">
     <u-navbar :auto-back="false" @leftClick="back" left-icon-color="#fff" :bg-color="background.backgroundColor" :border="false" >
     </u-navbar>
     <div class="wrapper">
@@ -16,10 +16,14 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, computed } from 'vue'
 import { onShow, onReachBottom } from '@dcloudio/uni-app'
 import { getBargainList } from '@/api/promotions'
 import goodsTemplate from '@/components/m-goods-list/promotion'
+import { useStore } from '@/store'
+import { getThemeStyle } from '@/utils/theme'
+const store = useStore()
+const themeStyle = computed(() => getThemeStyle(store.state.theme))
 
 const background = ref({
   backgroundColor: 'transparent',

pages/promotion/bargain/log.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="box">
+  <view :style="themeStyle" class="box">
     <view v-if="bargainLog.length != 0" class="list">
       <view v-for="(item,index) in bargainLog" class="card" :key="index">
         <view class="goods-img">
@@ -28,10 +28,14 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, computed } from 'vue'
 import { onShow, onReachBottom } from '@dcloudio/uni-app'
 import { getMineBargainLog } from '@/api/promotions'
 import { unitPrice } from '@/utils/filters.js'
+import { useStore } from '@/store'
+import { getThemeStyle } from '@/utils/theme'
+const store = useStore()
+const themeStyle = computed(() => getThemeStyle(store.state.theme))
 
 const params = ref({
   pageNumber: 1,

pages/promotion/point/pointList.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="index">
+  <view :style="themeStyle" class="index">
     <user-point />
     <view class="index-head">
       <!-- #ifdef H5 -->
@@ -100,7 +100,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from 'vue'
+import { ref, watch, computed } from 'vue'
 import {
   onLoad,
   onShow,
@@ -110,7 +110,11 @@ import {
 } from '@dcloudio/uni-app'
 import { getPointsCategory, getPointsGoods } from '@/api/promotions.js'
 import userPoint from './user.vue'
-import { unitPrice } from '@/utils/filters.js'
+import { unitPrice } from '@/utils/filters.js'
+import { useStore } from '@/store'
+import { getThemeStyle } from '@/utils/theme'
+const store = useStore()
+const themeStyle = computed(() => getThemeStyle(store.state.theme))
 
 interface CategoryTab {
   categoryId: number | string

pages/promotion/seckill.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="sale">
+	<view :style="themeStyle" class="sale">
 		<u-navbar
 			title="限时抢购"
 			:fixed="true"
@@ -39,11 +39,15 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, computed } from 'vue'
 import { onShow, onUnload } from '@dcloudio/uni-app'
 import { getSeckillTimeLine, getSeckillTimeGoods } from '@/api/promotions.js'
 import Foundation from '@/utils/Foundation.js'
-import goodsTemplate from '@/components/m-goods-list/promotion.vue'
+import goodsTemplate from '@/components/m-goods-list/promotion.vue'
+import { useStore } from '@/store'
+import { getThemeStyle } from '@/utils/theme'
+const store = useStore()
+const themeStyle = computed(() => getThemeStyle(store.state.theme))
 
 const nav = ref(0)
 const timeLine = ref<any[]>([])