Sfoglia il codice sorgente

feat: 秒杀信息调整

Basil 2 anni fa
parent
commit
4964bc997f

+ 1 - 1
.env.development

@@ -1 +1 @@
1
-VITE_GLOB_API_URL = 'https://test.bjtdba.com'
1
+VITE_GLOB_API_URL = 'https://app.bjtdba.com'

+ 1 - 1
.env.production

@@ -1 +1 @@
1
-VITE_GLOB_API_URL = 'https://test.bjtdba.com'
1
+VITE_GLOB_API_URL = 'https://app.bjtdba.com'

File diff suppressed because it is too large
+ 1 - 1
src/pages.json


+ 1 - 1
src/pages/home/index.vue

@@ -300,7 +300,7 @@ page {
300 300
   background-color: #f8f8f8;
301 301
 }
302 302
 </style>
303
-<route lang="yaml"   type="home">
303
+<route lang="yaml"  type="home">
304 304
 style:
305 305
   navigationStyle: custom
306 306
   navigationBarTitleText: 储蓄保

+ 1 - 1
src/pages/order/components/OrderItem.vue

@@ -66,7 +66,7 @@ function getStatusText(orderItem: OrderListModel) {
66 66
     return '已申请退款'
67 67
   }
68 68
   if (orderItem.status == 5) {
69
-    return '未支付'
69
+    return '待付款'
70 70
   }
71 71
 }
72 72
 

+ 1 - 1
src/pages/order/components/OrderObligationItem.vue

@@ -64,7 +64,7 @@ function getStatusText(orderItem: OrderListModel) {
64 64
     return '已申请退款'
65 65
   }
66 66
   if (orderItem.status == 5) {
67
-    return '未支付'
67
+    return '待付款'
68 68
   }
69 69
 }
70 70
 

+ 2 - 2
src/pages/payment/index.vue

@@ -101,8 +101,8 @@ function handleConfirm() {
101 101
       OrderLists: state.orderList,
102 102
       type: 'tdbaspzf'
103 103
     },
104
-    envVersion: 'trial', // develop(开发版),trial(体验版),release(正式版)
105
-    // envVersion: 'release', // develop(开发版),trial(体验版),release(正式版)
104
+    // envVersion: 'trial', // develop(开发版),trial(体验版),release(正式版)
105
+    envVersion: 'release', // develop(开发版),trial(体验版),release(正式版)
106 106
     success(res) {
107 107
       // 打开成功
108 108
       uni.showToast({

+ 1 - 1
src/pages/user/index.vue

@@ -117,7 +117,7 @@ onShow(async () => {
117 117
   //   orderBack: null
118 118
   // })
119 119
   uni.showLoading({
120
-    title: '登录中',
120
+    title: '加载中',
121 121
   })
122 122
   // if (userStore.token ? )
123 123
   if (uni.getStorageSync('UID')) {

+ 1 - 1
src/pages/user/login/index.vue

@@ -41,7 +41,7 @@ function handleViewXieyi(type: number) {
41 41
 
42 42
 async function handleWexinLogin() {
43 43
   await uni.showLoading({
44
-    title: '登录中'
44
+    title: '加载中'
45 45
   });
46 46
   uni.login({
47 47
     provider: 'weixin',

+ 59 - 21
src/pages/vip/index.vue

@@ -1,24 +1,32 @@
1 1
 <template>
2 2
 <!--  <CXBBasePage :show="true" title="">-->
3
+  <div
4
+      class="overflow-hidden fixed  w-full z-10 f-nav-bar-base"
5
+      :style="navBarStyle"
6
+      :class="headerClass"
7
+  >
8
+    <div class="flex items-center f-nav-bar-content-base">
9
+       <div class="f-nav-bar-icon mr-1 i-tabler-chevron-left" @tap="clickLeftHandler"/>
10
+
11
+      <nut-searchbar
12
+          v-model="state.keyword" @search="loadList('reload')" @clear="loadList('reload')">
13
+        <!--      <template v-slot:leftout>-->
14
+        <!--        <div @tap="navBack">-->
15
+        <!--          <nut-icon name="left"></nut-icon>-->
16
+        <!--        </div>-->
17
+        <!--      </template>-->
18
+        <template v-slot:rightin>
19
+          <div @tap="loadList('reload')"
20
+               class="bg-[#D71608] text-white text-xs w-11 rounded-full text-center py-1 my-0.5 ">
21
+            搜索
22
+          </div>
23
+        </template>
24
+      </nut-searchbar>
25
+    </div>
26
+
27
+  </div>
3 28
 
4 29
     <div class="flex flex-col gap-3 ">
5
-      <div
6
-          class="overflow-hidden fixed top-0 w-full z-10"
7
-      >
8
-        <nut-searchbar
9
-            v-model="state.keyword" @search="loadList('reload')" @clear="loadList('reload')">
10
-          <!--      <template v-slot:leftout>-->
11
-          <!--        <div @tap="navBack">-->
12
-          <!--          <nut-icon name="left"></nut-icon>-->
13
-          <!--        </div>-->
14
-          <!--      </template>-->
15
-          <template v-slot:rightout>
16
-            <div @tap="loadList('reload')">
17
-              搜索
18
-            </div>
19
-          </template>
20
-        </nut-searchbar>
21
-      </div>
22 30
 <!--      <image :src="homeBanner" mode="widthFix" class="h-10 w-full "></image>-->
23 31
 
24 32
       <div class="w-screen h-65">
@@ -129,7 +137,7 @@ const statusBarHeight = systemInfo.statusBarHeight ?? 0
129 137
 const userStore = useUserStore()
130 138
 const navBarStyle = computed(() => {
131 139
   return {
132
-    paddingTop: `${statusBarHeight}px`,
140
+    paddingTop: `${statusBarHeight - 4}px`,
133 141
   }
134 142
 })
135 143
 
@@ -194,6 +202,17 @@ onShareTimeline(() => {
194 202
   }
195 203
 })
196 204
 
205
+const headerClass = ref('')
206
+
207
+onPageScroll((page) => {
208
+  // page.scrollTop
209
+  if (page.scrollTop >= 76 ) {
210
+    headerClass.value = '!bg-primary !text-white'
211
+  } else {
212
+    headerClass.value = ''
213
+  }
214
+})
215
+
197 216
 
198 217
 
199 218
 function loadList(action: 'page' | 'reload', callback?: (items) => void) {
@@ -251,18 +270,37 @@ onPullDownRefresh(() => {
251 270
     }, 300)
252 271
   })
253 272
 })
273
+
274
+function clickLeftHandler() {
275
+  uni.navigateBack()
276
+}
254 277
 </script>
255 278
 
256 279
 <route lang="yaml">
257 280
 style:
281
+  navigationStyle: custom
258 282
   navigationBarTitleText: 储蓄保会员
259 283
   enablePullDownRefresh: true
260 284
 </route>
261
-<style>
285
+<style lang="scss">
262 286
 page {
263 287
   background: #f8f8f8;
264
-  --nut-searchbar-background: #fff;
265
-  --nut-searchbar-input-background: #f8f8f8;
288
+  //--nut-searchbar-background: #fff;
289
+  //--nut-searchbar-input-background: #f8f8f8;
290
+  //--nut-searchbar-input-width: 60%;
291
+  --nut-searchbar-width: 65%;
292
+  //--nut-searchbar-padding: 0;
293
+//var(--nut-searchbar-width, 100%)
266 294
   --nut-searchbar-input-box-shadow: none;
267 295
 }
296
+.nut-searchbar {
297
+  background: transparent !important;
298
+
299
+}
300
+.nut-searchbar__search-input {
301
+  width: 60% !important;
302
+}
303
+.f-nav-bar-icon {
304
+  --at-apply: 'text-lg'
305
+}
268 306
 </style>

BIN
src/static/icon/bangfu.png


File diff suppressed because it is too large
+ 27 - 112
src/test.json