2025-3-11

components/mpvue-citypicker/mpvueCityPicker.nvue

@@ -1,25 +1,28 @@
 <template>
-		<uv-popup ref="addressOpen">
-			<div class="mpvue-picker-content ">
-				<div class="mpvue-picker__hd" catchtouchmove="true">
-					<div class="mpvue-picker__action" @click="pickerCancel">取消</div>
-					<div class="mpvue-picker__action" :style="{color:themeColor}" @click="pickerConfirm">确定</div>
-				</div>
-				<picker-view indicator-style="height: 40px;" class="mpvue-picker-view" :value="pickerValue" @change="pickerChange">
-					<block>
-						<picker-view-column>
-							<div class="picker-item" v-for="(item,index) in provinceDataList" :key="index">{{item.label}}</div>
-						</picker-view-column>
-						<picker-view-column>
-							<div class="picker-item" v-for="(item,index) in cityDataList" :key="index">{{item.label}}</div>
-						</picker-view-column>
-						<picker-view-column>
-							<div class="picker-item" v-for="(item,index) in areaDataList" :key="index">{{item.label}}</div>
-						</picker-view-column>
-					</block>
-				</picker-view>
-			</div>
-		</uv-popup>
+	<uv-popup  mode="bottom"  ref="addressOpen">
+		<view class="mpvue-picker__hd" catchtouchmove="true">
+			<text class="mpvue-picker__action" @click="pickerCancel">取消</text>
+			<text class="mpvue-picker__action" :style="{color:themeColor}" @click="pickerConfirm">确定</text>
+		</view>
+		<picker-view class="picker-view" indicator-style='height:100rpx' :value="pickerValue" @change="pickerChange">
+			<picker-view-column>
+				<view class="picker-item" v-for="(item,index) in provinceDataList" :key="index">
+					<text>{{item.label}}</text>
+				</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="picker-item" v-for="(item,index) in cityDataList" :key="index">
+					<text>{{item.label}}</text>
+				</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="picker-item" v-for="(item,index) in areaDataList" :key="index">
+					<text>{{item.label}}</text>
+				</view>
+			</picker-view-column>
+		</picker-view>
+	</uv-popup>
+		
 </template>
 <script>
 	var province = [{"value":"110000","label":"北京"},{"value":"120000","label":"天津"},{"value":"130000","label":"河北省"},{"value":"140000","label":"山西省"},{"value":"150000","label":"内蒙古自治区"},{"value":"210000","label":"辽宁省"},{"value":"220000","label":"吉林省"},{"value":"230000","label":"黑龙江省"},{"value":"310000","label":"上海"},{"value":"320000","label":"江苏省"},{"value":"330000","label":"浙江省"},{"value":"340000","label":"安徽省"},{"value":"350000","label":"福建省"},{"value":"360000","label":"江西省"},{"value":"370000","label":"山东省"},{"value":"410000","label":"河南省"},{"value":"420000","label":"湖北省"},{"value":"430000","label":"湖南省"},{"value":"440000","label":"广东省"},{"value":"450000","label":"广西壮族自治区"},{"value":"460000","label":"海南省"},{"value":"500000","label":"重庆"},{"value":"510000","label":"四川省"},{"value":"520000","label":"贵州省"},{"value":"530000","label":"云南省"},{"value":"540000","label":"西藏自治区"},{"value":"610000","label":"陕西省"},{"value":"620000","label":"甘肃省"},{"value":"630000","label":"青海省"},{"value":"640000","label":"宁夏回族自治区"},{"value":"650000","label":"新疆维吾尔自治区"}];
@@ -55,7 +58,7 @@
 		},
 		watch: {
 			pickerValueDefault() {
-				console.log('1111');
+				// console.log('1111');
 				this.init();
 			}
 		},
@@ -84,9 +87,6 @@
 			show() {
 				this.$refs.addressOpen.open()
 			},
-			maskClick() {
-				this.pickerCancel();
-			},
 			pickerCancel() {
 				this.$refs.addressOpen.close()
 				this._$emit('onCancel');
@@ -100,7 +100,6 @@
 			},
 			handPickValueDefault() {
 				const pickerValueDefault = this.pickerValueDefault
-
 				let provinceIndex = pickerValueDefault[0]
 				let cityIndex = pickerValueDefault[1]
 				const areaIndex = pickerValueDefault[2]
@@ -121,7 +120,8 @@
 				}
 			},
 			pickerChange(e) {
-				let changePickerValue = e.mp.detail.value;
+				// console.log(e,'eeeee')
+				let changePickerValue = e.detail.value;
 				if (this.pickerValue[0] !== changePickerValue[0]) {
 					// 第一级发生滚动
 					this.cityDataList = cityData[changePickerValue[0]];
@@ -162,57 +162,27 @@
 </script>
 
 <style>
-	.mpvue-picker__hd {
-		padding: 9px 15px;
-		background-color: #fff;
-		font-size: 17px;
-		flex-direction: row;
+	.picker-view {
 		width: 750rpx;
-		justify-content: space-between;
-	}
-
-	.mpvue-picker__hd:after {
-		content: ' ';
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		right: 0;
-		height: 1px;
-		border-bottom: 1px solid #e5e5e5;
-		color: #e5e5e5;
-		transform-origin: 0 100%;
-		transform: scaleY(0.5);
+		height: 600rpx;
+		margin-top: 20rpx;
 	}
-
-	.mpvue-picker__action {
-		display: block;
-		flex: 1;
-		color: #1aad19;
-	}
-
-	.mpvue-picker__action:first-child {
-		text-align: left;
-		color: #888;
-	}
-
-	.mpvue-picker__action:last-child {
-		text-align: right;
-	}
-
 	.picker-item {
-		text-align: center;
-		line-height: 40px;
+		border: 1px soli #000;
+		height: 100rpx;
 		text-overflow: ellipsis;
-		white-space: nowrap;
-		font-size: 16px;
+		lines:1;
+		font-size: 32rpx;
+		justify-content: center;
+		align-items: center;
+		flex-direction: row;
 	}
-
-	.mpvue-picker-view {
+	.mpvue-picker__hd {
+		padding: 9px 15px;
+		background-color: #fff;
 		position: relative;
-		bottom: 0;
-		left: 0;
-		width: 750rpx;
-		height: 238px;
-		background-color: rgba(255, 255, 255, 1);
+		font-size: 17px;
+		flex-direction: row;
+		justify-content: space-between;
 	}
 </style>

pages/guild/itemIndex.vue

@@ -210,7 +210,7 @@
 			<view class="body fx-h fx-bc fx-ac">
 				<view style="font-size: 16px;color: #333;font-weight: bold;padding-bottom: 25rpx;">CBB产品订单购买协议</view>
 				<scroll-view scroll-y class="max-he">
-					<u-parse :content="topData.content"></u-parse>
+					<uv-parse  :content="topData.content"></uv-parse>
 				</scroll-view>
 				<view class="btn" @tap="tapAction">已阅读并同意</view>
 			</view>

pages/user/address/add/add.nvue

@@ -1,60 +1,58 @@
 <template>
 	<view>
-		<form report-submit="true" @submit="formSubmit">
-			<view class="box">
-				<view class="add-line">
-					<view class="al-left">
-						<text class="text">收货人</text>
-					</view>
-					<view class="al-right">
-						<input class="input" placeholder="收货人" placeholder-class="p-size" name="name"
-							v-model="data.name" />
-					</view>
+		<view class="box">
+			<view class="add-line">
+				<view class="al-left">
+					<text class="text">收货人</text>
 				</view>
-				<view class="add-line">
-					<view class="al-left">
-						<text class="text">手机号码</text>
-					</view>
-					<view class="al-right">
-						<input class="input" placeholder="手机号码" placeholder-class="p-size" name="tel" type="number"
-							v-model="data.tel" />
-					</view>
+				<view class="al-right">
+					<input class="input" placeholder="收货人" placeholder-class="p-size" name="name"
+						v-model="data.name" />
 				</view>
-				<view class="add-line">
-					<view class="al-left">
-						<text class="text">所在地区</text>
-					</view>
-					<view class="al-right" @tap="showMulLinkageThreePicker">
-						<text class="addresstext" :style="'color:' + (data.region ? '#333' : '#585858') ">
-							{{data.region ? data.region : "请选择"}}
-						</text>
-						<input type="text" name="region" v-show="false" :value="data.region" />
-						<view class="alr-jiantou">
-							<image class="image" src="/static/img/ic_next.png"></image>
-						</view>
-					</view>
+			</view>
+			<view class="add-line">
+				<view class="al-left">
+					<text class="text">手机号码</text>
 				</view>
-				<view class="add-line">
-					<view class="al-left">
-						<text  class="text">详细地址</text>
-					</view>
-					<view class="al-right">
-						<textarea class="textarea" placeholder-class="p-size" name="address"
-							placeholder="详细省份，城市，道路，门牌号，小区，楼栋号，单元室等（必填）" v-model="data.address" />
+				<view class="al-right">
+					<input class="input" placeholder="手机号码" placeholder-class="p-size" name="tel" type="number"
+						v-model="data.tel" />
+				</view>
+			</view>
+			<view class="add-line">
+				<view class="al-left">
+					<text class="text">所在地区</text>
+				</view>
+				<view class="al-right" @tap="showMulLinkageThreePicker">
+					<text class="addresstext" :style="'color:' + (data.region ? '#333' : '#585858') ">
+						{{data.region ? data.region : "请选择"}}
+					</text>
+					<input type="text" name="region" v-show="false" :value="data.region" />
+					<view class="alr-jiantou">
+						<image class="image" src="/static/img/ic_next.png"></image>
 					</view>
 				</view>
-				<button class="nt add-btn" formType="submit">
-					<text class="add-btn-text">保存</text>
-				</button>
 			</view>
-		</form>
+			<view class="add-line">
+				<view class="al-left">
+					<text  class="text">详细地址</text>
+				</view>
+				<view class="al-right">
+					<textarea class="textarea" placeholder-class="p-size" name="address"
+						placeholder="详细省份，城市，道路，门牌号，小区，楼栋号，单元室等（必填）" v-model="data.address" />
+				</view>
+			</view>
+			<button class="nt add-btn" formType="submit">
+				<text class="add-btn-text">保存</text>
+			</button>
+		</view>
 		<mpvue-city-picker :themeColor="themeColor" ref="mpvueCityPicker" :pickerValueDefault="cityPickerValueDefault"
 			@onCancel="onCancel" @onConfirm="onConfirm"></mpvue-city-picker>
 	</view>
 </template>
 
 <script>
-	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue';
+	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.nvue';
 	import graceChecker from "@/library/utils/graceChecker.js";
 	import Request from '@/library/Request';
 	import utils from "@/library/utils/Comm.js"
@@ -104,7 +102,13 @@
 			//表单提交
 			formSubmit(e) {
 				var that = this,
-					formData = e.detail.value;
+					formData = {
+						name:that.data.name,
+						tel:that.data.tel,
+						address:that.data.address,
+						region:that.data.region,
+						City:that.data.City,
+					};
 				//定义表单规则
 				var rule = [{
 						name: "name",

pages/user/index.nvue

@@ -24,9 +24,9 @@
 							<text class="name">{{ user.mentor_name }}</text>
 						</view>
 						<view class="newPeople" v-if="isNewShow">
-							<text v-if="user.regtime == 0">到期时间:永久</text>
+							<text class='newPeopletext' v-if="user.regtime == 0">到期时间:永久</text>
 							<view v-if="user.regtime > 0" class="">
-								<text>到期时间</text>：<uv-count-down :time="timeValues" format="DD:HH:mm:ss"></uv-count-down>
+								<text  class='newPeopletext' >到期时间</text>：<uv-count-down :time="timeValues" format="DD:HH:mm:ss"></uv-count-down>
 							</view>
 						</view>
 					</view>
@@ -72,8 +72,8 @@
 						<view class="line"></view>
 						<view class="item fx-r fx-bc fx-ac" @tap="tapOpen" data-url="/pages/user/detail/award">
 							<view class="itemLeftBox">
-								<view class="name">奖金</view>
-								<view class="count">{{ user != null ? user.award : 0 }}</view>
+								<text class="name">奖金</text>
+								<text class="count">{{ user != null ? user.award : 0 }}</text>
 							</view>
 							<image class="rightImageIcon" src="/static/img/userinfo4.png" mode="scaleToFill"></image>
 						</view>
@@ -81,7 +81,7 @@
 						<view class="item">
 							<view class="itemLeftBox">
 								<text class="name">实名</text>
-								<view class="count">{{ user != null ? user.is_auth==1 ? '是':'否':''}}</view>
+								<text class="count">{{ user != null ? user.is_auth==1 ? '是':'否':''}}</text>
 							</view>
 							<image class="rightImageIcon" src="/static/img/userinfo4.png" mode="scaleToFill"></image>
 						</view>
@@ -250,9 +250,11 @@
 	}
 
 	.newPeople {
-		font-size: 12px;
-		color: #999;
 		padding-top: 15rpx;
+		.newPeopletext{
+			font-size: 12px;
+			color: #999;
+		}
 	}
 
 	.top-view {

pages/user/userinfo/area.vue

@@ -36,9 +36,6 @@
 		</view>
 		
 		<button class="nt update-btn" @tap="formSubmit" >确认保存</button>
-	
-		
-		
 		<mpvue-city-picker :themeColor="themeColor" ref="mpvueCityPicker" :pickerValueDefault="cityPickerValueDefault"
 		 @onCancel="onCancel" @onConfirm="onConfirm"></mpvue-city-picker>
 	</view>

uni_modules/uv-parse/components/uv-parse/uv-parse.vue

@@ -112,6 +112,7 @@ export default {
   // #endif
   watch: {
     content (content) {
+		console.log(content,'content')
       this.setContent(content)
     }
   },