2025-3-21

App.vue

@@ -172,7 +172,7 @@
 		position: relative;
 		font-size: 12px;
 	}
-	.update-btn{
+	.base-btn{
 		width: 690rpx;
 		background: #ef4034;
 		border-radius: 100rpx;

pages/index/index.nvue

@@ -84,8 +84,7 @@
 								<text class="tag" v-if="sysData.is_audit == 0">积分</text>
 								<text class="tag" v-else>参考价</text>
 							</view>
-							<view class="fx-g1"></view>
-							<text class="btn" v-if="sysData.is_audit == 0">提货</text>
+							<image  v-if="sysData.is_audit == 0" class="tagIcon" src="/static/img/indexChat.png" mode="scaleToFill"></image>
 						</view>
 					</view>
 				</view>
@@ -753,7 +752,10 @@
 				padding: 20rpx 20rpx;
 				flex-direction: row;
 				justify-content: space-between;
-	
+				.tagIcon{
+					width: 48rpx;
+					height: 48rpx;
+				}
 				.score {
 					flex-direction: row;
 					align-items: flex-end;
@@ -770,14 +772,6 @@
 						color: #FF4C4C;
 					}
 				}
-	
-				.btn {
-					background-image: linear-gradient(143.2747deg, #FF6A00, #EE0979);
-					border-radius: 40rpx;
-					padding: 10rpx 28rpx;
-					font-size: 22rpx;
-					color: #FFFFFF;
-				}
 			}
 			.info {
 				border-bottom: 1px solid #F8F8F8;

pages/user/address/add/add.nvue

@@ -42,7 +42,7 @@
 						placeholder="详细省份，城市，道路，门牌号，小区，楼栋号，单元室等（必填）" v-model="data.address" />
 				</view>
 			</view>
-			<button class="update-btn" formType="submit">
+			<button class="base-btn" formType="submit">
 				<text class="btn-text">保存</text>
 			</button>
 		</view>

pages/user/address/address.nvue

@@ -27,7 +27,7 @@
 				</view>
 			</view>
 		</view>
-		<button class="update-btn" @tap="addClick">
+		<button class="base-btn" @tap="addClick">
 			<text class="btn-text">
 				新增地址
 			</text>

pages/user/approve.nvue

@@ -18,7 +18,7 @@
 				</view>
 			</view>
 		</view>
-		<button class="update-btn">
+		<button class="base-btn">
 			<text class="btn-text" @tap="formSubmit">实名认证</text>
 		</button>
 	</view>

pages/user/bank/save/alipay.nvue

@@ -96,7 +96,7 @@
 				<image :src="form.img" v-else mode="aspectFill" class="img"></image>
 			</view>
 		</view>
-		<button class="update-btn" @tap="tapSubmit">
+		<button class="base-btn" @tap="tapSubmit">
 			<text class="btn-text">保存</text>
 		</button>
 	</view>

pages/user/bank/save/bank.nvue

@@ -86,7 +86,7 @@
 				</view>
 			</view>
 		</view>
-		<button class="update-btn" @tap="tapSubmit">
+		<button class="base-btn" @tap="tapSubmit">
 			<text class="btn-text">保存</text>
 		</button>
 	</view>

pages/user/bank/save/weixin.nvue

@@ -102,7 +102,7 @@
 				<image :src="form.img" v-else mode="aspectFill" class="img"></image>
 			</view>
 		</view>
-		<button class="update-btn" @tap="tapSubmit">
+		<button class="base-btn" @tap="tapSubmit">
 			<text class="btn-text">保存</text>
 		</button>
 	</view>

pages/user/detail/integral_gift.nvue

@@ -1,68 +1,62 @@
 <template>
-	<view>
-		<uni-nav-bar :border="false" statusBar left-icon="left" @clickLeft="utils.navigateBack()"
-			@clickRight="tapOpenLog" fixed title="趣豆转账">
-			<view style="color: #ef4034;" slot="right">
+	<view class="page">
+		<uni-nav-bar :border="false" statusBar left-icon="left" @clickLeft="pageback" @clickRight="tapOpenLog" fixed
+			title="趣豆转账">
+			<text class="nav-text" slot="right">
 				转账记录
-			</view>
+			</text>
 		</uni-nav-bar>
-		<view style="height: 10px;"></view>
-		<view class="topinfo fx-h fx-bc fx-ac">
-			<view class="count">{{ user.integral || 0 }}</view>
-			<view class="text">当前可用(趣豆)</view>
-		</view>
-		<view style="height: 10px;"></view>
-		<view class="info-line">
-			<view class="il-top">
-				<text>转账类型</text>
-			</view>
-			<view class="il-bot fx-r fx-bc fx-ac">
-				<uv-radio-group v-model="type">
-					<uv-radio activeColor="red" name="id" label="收款ID"></uv-radio>
-					<view style="width: 40px;"></view>
-					<uv-radio activeColor="red" name="phone" label="收款手机号"></uv-radio>
-				</uv-radio-group>
-			</view>
-		</view>
+		<view class="page">
 
-		<view class="info-line" v-if="type == 'id'">
-			<view class="il-top">
-				<text>收款人id</text>
-			</view>
-			<view class="il-bot">
-				<input placeholder="收款人id" @input="tapGetId" type="number" v-model="uid" />
-				<view class="name">{{ sendname }}</view>
+			<view class="topinfo">
+				<text class="count">{{ user.integral || 0 }}</text>
+				<text class="text">当前可用(趣豆)</text>
 			</view>
-		</view>
-		<view class="info-line" v-if="type == 'phone'">
-			<view class="il-top">
-				<text>手机号码</text>
-			</view>
-			<view class="il-bot">
-				<input placeholder="转账手机号码" @input="tapGetMobile" type="number" v-model="new_mobile" />
-				<view class="name">{{ sendname }}</view>
+			<view class="info-line">
+				<view class="il-top">
+					<text>转账类型</text>
+				</view>
+				<view class="il-bot">
+					<uv-radio-group v-model="type">
+						<uv-radio activeColor="red" name="id" label="收款ID"></uv-radio>
+						<uv-radio activeColor="red" name="phone" label="收款手机号"></uv-radio>
+					</uv-radio-group>
+				</view>
 			</view>
-		</view>
-		<view class="info-line">
-			<view class="il-top">
-				<text>转账金额</text>
+
+			<view class="info-line" v-if="type == 'id'">
+				<view class="il-top">
+					<text>收款人id</text>
+				</view>
+				<view class="il-bot">
+					<input placeholder="收款人id" @input="tapGetId" type="number" v-model="uid" />
+					<view class="name">{{ sendname }}</view>
+				</view>
 			</view>
-			<view class="il-code">
-				<view class="etb-left">
-					<input placeholder="请输入转账金额" placeholder-class="placeholder-class" v-model="num" />
+			<view class="info-line" v-if="type == 'phone'">
+				<view class="il-top">
+					<text>手机号码</text>
+				</view>
+				<view class="il-bot">
+					<input placeholder="转账手机号码" @input="tapGetMobile" type="number" v-model="new_mobile" />
+					<view class="name">{{ sendname }}</view>
 				</view>
-				<!-- <view class="etb-right" @click="num = allMoney()">
-					<text>全部</text>
-				</view> -->
 			</view>
-		</view>
-		<view class="info-line">
-			<view class="update-btn" @click="tapSubmit">
-				<text>确认转账</text>
+			<view class="info-line">
+				<view class="il-top">
+					<text>转账金额</text>
+				</view>
+				<view class="il-code">
+					<view class="etb-left">
+						<input class="input" placeholder="请输入转账金额" v-model="num" />
+					</view>
+				</view>
 			</view>
-			<view style="height: 10px;"></view>
+			<button class="base-btn" @tap="tapSubmit">
+				<text class="btn-text">确认转账</text>
+			</button>
 		</view>
-		<PayDialog ref="payDialog" @getPassword="getPassword"></PayDialog>
+		<!-- <PayDialog ref="payDialog" @getPassword="getPassword"></PayDialog> -->
 	</view>
 </template>
 
@@ -71,12 +65,14 @@
 		mapState,
 		mapMutations
 	} from 'vuex';
-	import PayDialog from "@/components/ui-pay/payDialog.vue";
+	// import PayDialog from "@/components/ui-pay/payDialog.nvue";
+	import utils from "@/library/utils/Comm.js"
+	import Request from '@/library/Request';
 	export default {
 		computed: mapState(['user', 'sysData']),
-		components: {
-			PayDialog
-		},
+		// components: {
+		// 	PayDialog
+		// },
 		data() {
 			return {
 				num: '',
@@ -97,15 +93,16 @@
 		},
 		methods: {
 			...mapMutations(['checkUserLogin']),
-
+			pageback() {
+				utils.navigateBack()
+			},
 			tapGetId: function(ev) {
 				let id = ev.detail.value;
 				if (id == "") {
 					this.sendname = '';
 					return;
 				}
-				this
-					.request
+				Request
 					.post("userCkUserName", {
 						uid: id,
 						type: 2
@@ -122,12 +119,11 @@
 
 			tapGetMobile: function(ev) {
 				let mobile = ev.detail.value;
-				if (!this.utils.isPoneAvailable(mobile)) {
+				if (!utils.isPoneAvailable(mobile)) {
 					this.sendname = '';
 					return;
 				}
-				this
-					.request
+				Request
 					.post("userCkUserName", {
 						mobile: mobile,
 						type: 2
@@ -136,7 +132,7 @@
 						if (res.code == 200) {
 							this.sendname = res.data.name;
 						} else {
-							//this.utils.Tip(res.msg);
+							//utils.Tip(res.msg);
 						}
 					});
 
@@ -154,7 +150,7 @@
 			 */
 			getKc: function() {
 				if (isNaN(this.num)) return "0.00";
-				let val = this.utils.returnFloat(this.num * (this.data.lv / 100));
+				let val = utils.returnFloat(this.num * (this.data.lv / 100));
 				return val;
 			},
 			/**
@@ -162,7 +158,7 @@
 			 */
 			allMoney: function() {
 				if (this.user.integral <= 0) return 0;
-				let val = this.utils.returnFloat(this.user.integral * (this.data.lv / 100));
+				let val = utils.returnFloat(this.user.integral * (this.data.lv / 100));
 				return this.user.integral - parseFloat(val);
 			},
 
@@ -172,21 +168,21 @@
 			tapSubmit: function() {
 
 				if (this.new_mobile == '' && this.type == 'phone') {
-					this.utils.Tip("请输入转账号码");
+					utils.Tip("请输入转账号码");
 					return;
 				}
 
 				if (this.uid == '' && this.type == 'id') {
-					this.utils.Tip("请输入转账id");
+					utils.Tip("请输入转账id");
 					return;
 				}
 
 				if (this.num <= 0 || this.num == '') {
-					this.utils.Tip("请输入正确转账金额!");
+					utils.Tip("请输入正确转账金额!");
 					return;
 				}
 				if (parseFloat(this.num) > this.allMoney()) {
-					this.utils.Tip("转账金额超过剩余金额");
+					utils.Tip("转账金额超过剩余金额");
 					return;
 				}
 
@@ -195,9 +191,8 @@
 
 			getPassword: function(val) {
 				var password = val.password;
-				this.utils.loadIng("提交中..");
-				this
-					.request
+				utils.loadIng("提交中..");
+				Request
 					.post("integralGive", {
 						new_password: password,
 						new_mobile: this.new_mobile,
@@ -208,17 +203,17 @@
 					.then(res => {
 						uni.hideLoading();
 						if (res.code == 200) {
-							this.utils.Tip(res.msg);
+							utils.Tip(res.msg);
 							setTimeout(function() {
 								uni.navigateBack();
 							}, 1000);
 						} else {
-							this.utils.Tip(res.msg);
+							utils.Tip(res.msg);
 							this.$refs['payDialog'].cleanNum();
 						}
 					}).catch(function() {
 						uni.hideLoading();
-						this.utils.Tip("网络错误，请稍后尝试");
+						utils.Tip("网络错误，请稍后尝试");
 					});
 			}
 
@@ -228,14 +223,15 @@
 </script>
 
 
-<style>
-	page {
+<style lang="scss">
+	.page {
 		background: #F5F5F5;
+		padding: 30rpx;
 	}
 
-	#box {
-		padding-top: 90px;
-		z-index: -1;
+	.nav-text {
+		color: #ef4034;
+		font-size: 14px;
 	}
 
 	.topinfo {
@@ -243,15 +239,14 @@
 		padding: 40rpx 0;
 
 		.count {
-			background-size: 100%;
+			text-align: center;
 			font-size: 24px;
 			color: #303133;
 			font-weight: 700;
-			background-repeat: no-repeat;
-			background-position: 50%;
 		}
 
 		.text {
+			text-align: center;
 			color: #909399;
 			font-size: 18px;
 		}

pages/user/userinfo/area.nvue

@@ -50,7 +50,7 @@
 			</view>
 		</view>
 
-		<button class="update-btn" @tap="formSubmit">
+		<button class="base-btn" @tap="formSubmit">
 			<text class="btn-text">确认保存</text>
 		</button>
 		<mpvue-city-picker :themeColor="themeColor" ref="mpvueCityPicker" :pickerValueDefault="cityPickerValueDefault"

pages/user/userinfo/nickname.nvue

@@ -1,69 +1,103 @@
 <style>
-	page{background: #ffffff;}
-	.m-app{width:100vw}
-	button.sub-btn{width:100%;height:40px;line-height: 40px; background:#db292b;border-radius:20px;font-size:15px;font-weight:500;color:#ffffff;margin-top: 30px;}
-    .form-body{width:calc(100% - 24px);background: #ffffff;padding: 0px 12px;}
-	.form-title{width:100%;text-align: left;font-size: 14px;color:#333333;height:38px;line-height: 38px;}
-	.form-content{width:100%}
-	input.form-input{height:38px;width:100%;text-align: left;color:#db292b;border-bottom: 1px solid #db292b;font-size: 14px;}
-	.form-msg{font-size: 12px;text-align: left;width:100%;height:30px;line-height: 30px;color:#303033}
+	.m-app {
+		width: 750rpx;
+		padding: 30rpx;
+	}
+
+	.form-body {
+		background: #ffffff;
+		padding: 0px 12px;
+		box-shadow: 5rpx 5rpx 8rpx rgba(0, 0, 0, 0.1);
+		border-radius: 20rpx;
+	}
+
+	.form-title {
+		text-align: left;
+		font-size: 14px;
+		color: #333333;
+		height: 38px;
+		line-height: 38px;
+	}
+
+	.form-input {
+		height: 38px;
+		text-align: left;
+		color: #db292b;
+		border-bottom: 1px solid #db292b;
+		font-size: 14px;
+	}
+
+	.form-msg {
+		font-size: 12px;
+		text-align: left;
+		height: 30px;
+		line-height: 30px;
+		color: #303033;
+	}
 </style>
 <template>
 	<view class="m-app">
 		<form report-submit="true" @submit="formSubmit">
-		<view class='form-body'>
-			<view class="form-title">
-				用户昵称:
-			</view>
-			<view class="form-content">
-				<input class="form-input" type="text" name="val" :value="val"/>
+			<view class='form-body'>
+				<text class="form-title">
+					用户昵称:
+				</text>
+				<view class="form-content">
+					<input class="form-input" type="text" name="val" :value="val" />
+				</view>
+				<text class="form-msg">限4-16个字符，一个汉字为两个字符</text>
+				<button class="base-btn" formType="submit">
+					<text class="btn-text">确认保存</text>
+				</button>
 			</view>
-			<view class="form-msg">限4-16个字符，一个汉字为两个字符</view>
-			<button class="nt sub-btn" formType="submit">确认保存</button>
-		</view>
 		</form>
 	</view>
 </template>
 
 <script>
-	import {mapState,mapMutations} from 'vuex'
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex'
+	import utils from "@/library/utils/Comm.js";
+	import Request from '@/library/Request';
 	export default {
 		computed: mapState(['user']),
 		data() {
 			return {
-				val:""
+				val: ""
 			}
 		},
 		onLoad(options) {
 			this.val = options.val || "";
-			
 		},
 		methods: {
-			formSubmit:function(e){
-				var that = this , formData = e.detail.value;
-				if(!this.utils.isDefine(formData.val)){
-					this.utils.Tip("输入正确的用户昵称");
+			formSubmit: function(e) {
+				const  that = this;
+				const formData = e.detail.value;
+				if (!utils.isDefine(formData.val)) {
+					utils.Tip("输入正确的用户昵称");
 					return;
 				}
 				formData.code = "nickname";
-				this.utils.loadIng("提交中..")
-				this
-					.request
-					.post("userInfoSave",formData)
-					.then(res=>{
+				utils.loadIng("提交中..")
+				Request
+					.post("userInfoSave", formData)
+					.then(res => {
 						uni.hideLoading();
-						if(res.code == 200) {
-							this.utils.Tip(res.msg);
-							setTimeout(function(){ uni.navigateBack();},1000);
-						}else{
-							that.utils.Tip(res.msg);
+						if (res.code == 200) {
+							utils.Tip(res.msg);
+							setTimeout(function() {
+								uni.navigateBack();
+							}, 1000);
+						} else {
+							utils.Tip(res.msg);
 						}
-					}).catch(function(){
+					}).catch(function() {
 						uni.hideLoading();
-						that.utils.Tip("网络错误，请稍后尝试");
+						utils.Tip("网络错误，请稍后尝试");
 					});
 			}
-			
 		},
 	}
-</script>
+</script>

pages/user/userinfo/password.nvue

@@ -34,7 +34,7 @@
 				<input class="input" placeholder="再次输入密码" v-model="two_password" password />
 			</view>
 		</view>
-		<button class="update-btn" @click="tapSubmit">
+		<button class="base-btn" @click="tapSubmit">
 			<text class="btn-text">修改</text>
 		</button>
 

store/index.js

@@ -6,10 +6,6 @@ import md5 from "../library/vendor/md5.js";
 import base64 from "@/library/vendor/base64.js";
 import global from '@/config/global.js';
 import request from '@/library/Request.js';
-// import {
-// 	v4 as uuidv4
-// } from "uuid";
-
 import permission from './modules/permission.js';
 const namespaced = true;
 var isWxLoad = false;
@@ -102,11 +98,7 @@ const store = new Vuex.Store({
 					app_update: "你有新版本要更新"
 				});
 				// #endif
-
 				this.commit("setHttp", global.apiHttps[0]);
-
-
-
 			} catch (e) {
 				console.log(e, 'safasdfasdfas ');
 			}