10.10 风格替换备份

package.json

@@ -14,5 +14,8 @@
             "通用组件"
         ]
     },
-    "name": "zw-tabbar自定义tabbar"
+    "name": "zw-tabbar自定义tabbar",
+    "scripts": {
+        "dev:mp-weixin": "pnpm run dev -- --miniprogram mp-weixin"
+    }
 }

pages.json

@@ -1,5 +1,5 @@
 {
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+	"pages": [ 
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -267,14 +267,10 @@
 		"navigationBarTitleText": "换电云",
 		"navigationBarBackgroundColor": "#ffffff",
 		"backgroundColor": "#F8F8F8",
-		// "enablePullDownRefresh": true,
 		"onReachBottomDistance": 100
-		// 配置取消系统导航栏
-		// "navigationStyle": "custom"
 	},
 	"easycom": {
 		"autoscan": true,
-		// 注意一定要放在custom里，否则无效，https://ask.dcloud.net.cn/question/131175
 		"custom": {
 			"^u--(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue",
 			"^up-(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue",

pages/userCenter/userCenter.vue

@@ -83,7 +83,7 @@
 						<text class="lg text-gray cuIcon-right padding-top-xs"></text>
 					</view>
 				</view>
-				<view class="flex padding-tb-sm justify-between" @click="gobillingPage">
+				<view class="flex solids-bottom padding-tb-sm justify-between" @click="gobillingPage">
 					<view class="flex">
 						<image class="titleImg" src="../../static/user/myOrder.svg" mode="scaleToFill">
 						</image>

pagesCenter/accountBalance/accountBalance.vue

@@ -19,7 +19,10 @@
 				</view>
 			</view>
 		</view>
-		<view class="action padding-lr-sm padding-bottom-sm"><text class="cuIcon-titles textBlue"></text>充值明细</view>
+		<view class="tab_cls">
+			<uv-subsection :list="tab_list" :current="tab_current" @change="tab_change"></uv-subsection>
+		</view>
+		<!-- <view class="action padding-lr-sm padding-bottom-sm"><text class="cuIcon-titles textBlue"></text>充值明细</view> -->
 		<view>
 			<view class="cu-card " v-for="(item,index) in payData" :key="index" v-if="payData.length!=0">
 				<view class="cu-item shadow">
@@ -58,6 +61,7 @@
 	// import {
 	// 	AESDecrypt
 	// } from '../../../static/utils/encodes.js';
+	import PayWalletApi from '@/sheep/api/pay/wallet';
 	import {
 		reactive,
 		ref,
@@ -74,12 +78,20 @@
 	const totalPages = ref() //总页数，用于判断是否加载完
 	const size = ref(10)
 	const pageNo = ref(1)
+	const tab_list = ref([
+		'充值明细', '消费明细'
+	])
+	const tab_current = ref(0)
 	onLoad(() => {
 		handle_bindType()
+		getPayconsumption()
 	})
 	onShow(() => {
 		getPayList(0)
 	})
+	const tab_change = (e) => {
+		tab_current.value = e
+	}
 	const handle_bindType = async (type) => {
 		let data = {
 			bindType: 1
@@ -115,6 +127,17 @@
 			}
 		})
 	}
+
+	const getPayconsumption = async () => {
+		let param = {
+			pageNo: pageNo.value,
+		}
+		const {
+			data,
+			code
+		} = await PayWalletApi.getWalletTransactionPage(param)
+		console.log(data, 'data')
+	}
 	onReachBottom(async () => {
 		if (payData.value.length == totalPages.value) {
 			uni.$u.toast('没有更多啦');
@@ -234,6 +257,9 @@
 		align-items: center;
 		justify-content: center;
 	}
+	.tab_cls {
+		padding: 0 30rpx;
+	}
 </style>
 <style lang="scss">
 	page {

pagesCenter/login/changepassword.vue

@@ -9,13 +9,12 @@
 					<input placeholder="请设置新密码" v-model="edit_password_form.password">
 				</view>
 			</uni-forms-item>
-			<!-- <uni-forms-item name="mobile">
+			<uni-forms-item name="mobile" v-if="option_mobile">
 				<view class="changePwd_form_wrap ">
 					<text>手机号:</text>
-					<input type="password" placeholder="请输入手机号" v-model="check_mobile">
+					<input placeholder="请输入手机号" v-model="check_mobile">
-					
 				</view>
-			</uni-forms-item> -->
+			</uni-forms-item>
 			<uni-forms-item name="code">
 				<view class="changePwd_form_wrap pxl">
 					<text>验证码:</text>
@@ -24,7 +23,7 @@
 				</view>
 			</uni-forms-item>
 		</uni-forms>
-		<text class="tips">密码长度6-12位，由字母数字构成</text>
+		<text class="tips">密码长度4-16位，由字母或数字构成</text>
 		<view class="btn">
 			<button @click="confirm">确定</button>
 		</view>
@@ -54,10 +53,10 @@
 		onShow,
 		onReachBottom
 	} from "@dcloudio/uni-app";
-	const option_mobile = ref('')
+	const option_mobile = ref(false)
 	onLoad((option) => {
 		// console.log(option, 'option');
-		option_mobile.value = option.mobile
+		option_mobile.value = option.ismobile
 	})
 	const edit_password_form = ref({
 		password: '',
@@ -91,8 +90,8 @@
 			title: '正在获取验证码'
 		})
 		let data = {
-			mobile: uni.getStorageSync("mobile"),
+			mobile: option_mobile.value ? check_mobile.value : uni.getStorageSync("mobile"),
-			scene: 3
+			scene: option_mobile.value ? 4 : 3
 		}
 		await uni.$request({
 			url: config.baseUrl + 'app-api/member/auth/send-sms-code',
@@ -129,8 +128,15 @@
 		if (!validate) {
 			return;
 		}
+		let config_url = ''
+		if (option_mobile.value) {
+			config_url = 'app-api/member/user/reset-password'
+			edit_password_form.value.mobile = check_mobile.value
+		} else {
+			config_url = 'app-api/member/user/update-password'
+		}
 		await uni.$request({
-			url: config.baseUrl + 'app-api/member/user/update-password',
+			url: config.baseUrl + config_url,
 			method: 'PUT',
 			data: edit_password_form.value
 		}).then((res) => {

pagesCenter/login/enter.vue

@@ -41,7 +41,9 @@
 
 				<button @click="handle_gologin">{{ islogin }}</button>
 				<view class="forgetPwd">
-					<span></span>
+					<view style="color: burlywood; font-weight: 600" @click="handle_forgetword">
+						忘记密码
+					</view>
 					<view v-if="islogin == '登录'">
 						没有账号，去<span style="color: aqua; " @click="change_login">注册</span>
 					</view>
@@ -178,6 +180,13 @@
 			}
 		})
 	}
+	
+	const handle_forgetword = () => {
+		uni.navigateTo({
+			url: `/pagesCenter/login/changepassword?ismobile=true`
+		})
+	}
+	
 	const handle_signin = async () => {
 		await uni.$request({
 			url: config.baseUrl + 'app-api/member/auth/login',

sheep/api/pay/wallet.js

@@ -48,11 +48,8 @@ const PayWalletApi = {
 	},
 	// 获得钱包流水分页
 	getWalletTransactionPage: (params) => {
-		const queryString = Object.keys(params)
-			.map((key) => encodeURIComponent(key) + '=' + params[key])
-			.join('&');
 		return request({
-			url: `/pay/wallet-transaction/page?${queryString}`,
+			url: `/pay/wallet-transaction/page?bindType=1&pageNo=${params.pageNo}&pageSize=10`,
 			method: 'GET',
 		});
 	},