From 4b2b359a019bc73405b63db16ee3fe6f8dc1cedc Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期六, 17 八月 2024 13:18:43 +0800
Subject: [PATCH] update ui等
---
sub_pages/partner/delivery/station-delivery.vue | 9 +++
pages/user/user-pwd/user-pwd.vue | 19 ++++--
sub_pages/customer/self/history.vue | 69 ++++++++++++++++++++--
manifest.json | 2
sub_pages/customer/self/collect.vue | 64 +++++++++++++++++++-
5 files changed, 144 insertions(+), 19 deletions(-)
diff --git a/manifest.json b/manifest.json
index f2448bf..782394c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -49,7 +49,7 @@
"quickapp" : {},
/* 快应用特有相关 */
"mp-weixin" : {
- "appid" : "wx3203fd935a6ffe09",
+ "appid" : "wx6d0ecc4e18710458",
"setting" : {
"urlCheck" : false,
"es6" : true,
diff --git a/pages/user/user-pwd/user-pwd.vue b/pages/user/user-pwd/user-pwd.vue
index 167a751..bb3566e 100644
--- a/pages/user/user-pwd/user-pwd.vue
+++ b/pages/user/user-pwd/user-pwd.vue
@@ -10,21 +10,28 @@
</u-form-item>
<u-divider></u-divider> -->
<u-form-item :label-position="labelPosition" label="新密码" prop="password" label-width="150">
- <u-input :password-icon="true" :border="border" :type="showPassword1?'text':'password'"
+ <u-input :password-icon="false" :border="border" :type="showPassword1?'text':'password'"
v-model="model.password" placeholder="请输入新密码">
<template slot="suffix">
- <uni-icons color="#20613D" :type="showPassword1 ? 'eye-slash-filled' : 'eye-filled'" size="24"
- @click="showPassword1=!showPassword1"></uni-icons>
+ <uni-icons color="#20613D" :type="showPassword1 ? 'eye-filled' : 'eye-slash-filled'" size="24"
+ @click="()=>{
+ showPassword1=!showPassword1;
+ $forceUpdate()
+ }"></uni-icons>
</template>
</u-input>
</u-form-item>
<u-divider></u-divider>
<u-form-item :label-position="labelPosition" label="确认密码" label-width="150" prop="rePassword">
- <u-input :password-icon="true" :border="border" :type="showPassword2?'text':'password'" v-model="model.rePassword"
+ <u-input :password-icon="false" :border="border" :type="showPassword2?'text':'password'"
+ v-model="model.rePassword"
placeholder="请确认密码">
<template slot="suffix">
- <uni-icons color="#20613D" :type="showPassword2 ? 'eye-slash-filled' : 'eye-filled'" size="24"
- @click="showPassword2=!showPassword2"></uni-icons>
+ <uni-icons color="#20613D" :type="showPassword2 ? 'eye-filled' : 'eye-slash-filled'" size="24"
+ @click="()=>{
+ showPassword2=!showPassword2;
+ $forceUpdate()
+ }"></uni-icons>
</template>
</u-input>
</u-form-item>
diff --git a/sub_pages/customer/self/collect.vue b/sub_pages/customer/self/collect.vue
index 1e4fcd1..f652d88 100644
--- a/sub_pages/customer/self/collect.vue
+++ b/sub_pages/customer/self/collect.vue
@@ -204,12 +204,14 @@
</view>
</view>
<view class="component-filter-container p10">
- <view class="flex1" @click.stop="order_show=true">
- {{ this.query.columnStr || '排序' }}
+ <!-- @click.stop="order_show=true" -->
+ <view class="flex1" @click.stop="$refs.popup_column.open()">
+ 排序{{ query.columnStr&&('-'+query.columnStr) || '' }}
<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
</view>
- <view class="flex1" @click.stop="level_show=true">
- {{ this.query.levelStr || '级别' }}
+ <!-- @click.stop="level_show=true" -->
+ <view class="flex1" @click.stop="$refs.popup_level.open()">
+ {{ query.levelStr || '级别' }}
<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
</view>
<view class="flex1 desc-gray" @click.stop="clearCollect">
@@ -229,7 +231,8 @@
<view class="trade-list-container">
<view class="trade-info-container flex" :class="[dto.status!=='UP'?'OFF':'']" v-for="(dto,index) of list"
:key="index">
- <image class="img img100 br-4 m-r-10" :class="[!dto.stock?'component-stock-zero':'']" :src="dto.url||dto.cover" @click.stop="toDetail(dto)"></image>
+ <image class="img img100 br-4 m-r-10" :class="[!dto.stock?'component-stock-zero':'']"
+ :src="dto.url||dto.cover" @click.stop="toDetail(dto)"></image>
<view class="flex1">
<view class="flex" @click.stop="toDetail(dto)">
<view class="title">
@@ -273,6 +276,57 @@
</view>
</view>
+
+
+ <uni-popup ref="popup_level" type="bottom">
+ <view class="component-popup_input_all">
+ <view class="text-center m-b-40" style="font-size: 48rpx;font-weight: 600;">点击选择不同级别</view>
+ <view v-for="(item,i) in level_columns" :key="i" class="m-t-20">
+ <view class="m-t-12 flex value-items">
+ <view class="value-item" @click="()=>{
+ if(each.value!==query.value){
+ query.level = each.value
+ query.levelStr = each.label
+ refreshList()
+ $refs.popup_level.close()
+ }
+ }" :class="[query.level==each.value?'cur':'']" v-for="(each, j) in item" :key="j">
+ {{ each.label || '-' }}
+ </view>
+ </view>
+ </view>
+ <view class="button-space"></view>
+ <view>
+ <view class="button-green" @click="$refs.popup_level.close()">关闭
+ </view>
+ </view>
+ </view>
+ </uni-popup>
+ <uni-popup ref="popup_column" type="bottom">
+ <view class="component-popup_input_all">
+ <view class="text-center m-b-40" style="font-size: 48rpx;font-weight: 600;">点击选择不同排序</view>
+ <view v-for="(item,i) in order_columns" :key="i" class="m-t-20">
+ <view class="m-t-12 flex value-items">
+ <view class="value-item" @click="()=>{
+ if(each.value!==query.value){
+ query.column = each.value
+ query.columnStr = each.label
+ refreshList()
+ $refs.popup_column.close()
+ }
+ }" :class="[query.column==each.value?'cur':'']" v-for="(each, j) in item" :key="j">
+ {{ each.label || '-' }}
+ </view>
+ </view>
+ </view>
+ <view class="button-space"></view>
+ <view>
+ <view class="button-green" @click="$refs.popup_column.close()">关闭
+ </view>
+ </view>
+ </view>
+ </uni-popup>
+
</view>
</template>
diff --git a/sub_pages/customer/self/history.vue b/sub_pages/customer/self/history.vue
index 29bd4b1..d1a2578 100644
--- a/sub_pages/customer/self/history.vue
+++ b/sub_pages/customer/self/history.vue
@@ -169,12 +169,14 @@
</view>
</view>
<view class="component-filter-container p10">
- <view class="flex1" @click.stop="order_show=true">
- {{ this.query.columnStr || '排序' }}
+ <!-- @click.stop="order_show=true" -->
+ <view class="flex1" @click.stop="$refs.popup_column.open()">
+ 排序{{ query.columnStr&&('-'+query.columnStr) || '' }}
<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
</view>
- <view class="flex1" @click.stop="level_show=true">
- {{ this.query.levelStr || '级别' }}
+ <!-- @click.stop="level_show=true" -->
+ <view class="flex1" @click.stop="$refs.popup_level.open()">
+ {{ query.levelStr || '级别' }}
<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
</view>
</view>
@@ -189,9 +191,10 @@
@cancel="order_show=false"></u-picker>
<view class="trade-list-container">
- <view class="trade-info-container flex" :class="[dto.status!=='UP'?'OFF':'']"
- v-for="(dto,index) of list" :key="index">
- <image class="img img100 br-4 m-r-10" :class="[!dto.stock?'component-stock-zero':'']" :src="dto.url||dto.cover" @click.stop="toDetail(dto)"></image>
+ <view class="trade-info-container flex" :class="[dto.status!=='UP'?'OFF':'']" v-for="(dto,index) of list"
+ :key="index">
+ <image class="img img100 br-4 m-r-10" :class="[!dto.stock?'component-stock-zero':'']"
+ :src="dto.url||dto.cover" @click.stop="toDetail(dto)"></image>
<view class="flex1">
<view class="flex" @click.stop="toDetail(dto)">
<view class="title">
@@ -232,6 +235,58 @@
</view>
</view>
+
+
+
+ <uni-popup ref="popup_level" type="bottom">
+ <view class="component-popup_input_all">
+ <view class="text-center m-b-40" style="font-size: 48rpx;font-weight: 600;">点击选择不同级别</view>
+ <view v-for="(item,i) in level_columns" :key="i" class="m-t-20">
+ <view class="m-t-12 flex value-items">
+ <view class="value-item" @click="()=>{
+ if(each.value!==query.value){
+ query.level = each.value
+ query.levelStr = each.label
+ refreshList()
+ $refs.popup_level.close()
+ }
+ }" :class="[query.level==each.value?'cur':'']" v-for="(each, j) in item" :key="j">
+ {{ each.label || '-' }}
+ </view>
+ </view>
+ </view>
+ <view class="button-space"></view>
+ <view>
+ <view class="button-green" @click="$refs.popup_level.close()">关闭
+ </view>
+ </view>
+ </view>
+ </uni-popup>
+ <uni-popup ref="popup_column" type="bottom">
+ <view class="component-popup_input_all">
+ <view class="text-center m-b-40" style="font-size: 48rpx;font-weight: 600;">点击选择不同排序</view>
+ <view v-for="(item,i) in order_columns" :key="i" class="m-t-20">
+ <view class="m-t-12 flex value-items">
+ <view class="value-item" @click="()=>{
+ if(each.value!==query.value){
+ query.column = each.value
+ query.columnStr = each.label
+ refreshList()
+ $refs.popup_column.close()
+ }
+ }" :class="[query.column==each.value?'cur':'']" v-for="(each, j) in item" :key="j">
+ {{ each.label || '-' }}
+ </view>
+ </view>
+ </view>
+ <view class="button-space"></view>
+ <view>
+ <view class="button-green" @click="$refs.popup_column.close()">关闭
+ </view>
+ </view>
+ </view>
+ </uni-popup>
+
</view>
</template>
diff --git a/sub_pages/partner/delivery/station-delivery.vue b/sub_pages/partner/delivery/station-delivery.vue
index 3f873d0..96eb007 100644
--- a/sub_pages/partner/delivery/station-delivery.vue
+++ b/sub_pages/partner/delivery/station-delivery.vue
@@ -42,6 +42,11 @@
url: `/sub_pages/partner/delivery/delivery?stationId=${item.stationId}&stationName=${item.name}`
})
},
+ showAll(){
+ uni.navigateTo({
+ url: `/sub_pages/partner/delivery/delivery`
+ })
+ }
}
}
</script>
@@ -58,6 +63,10 @@
</u-input>
</view>
</view>
+ <view class="search-container m-t-12 flex">
+ <view class="m-l-a m-r-0 w-fit" @click="showAll" >查看全部>></view>
+ </view>
+
--
Gitblit v1.9.3