修改收件人地址

commont/messages.js

@@ -295,7 +295,11 @@ export default {
 			Filling: '填写准确的寄送物品可帮助您推荐更合适的产品',
 			Note: '注：实际重量体积以收派员确定为准，物品在包装后重量可能会增加，重量小体积大时会按体积重量收费',
 			
-			window:'请点击右上角浮窗进行复制'
+			window:'请点击右上角浮窗进行复制',
+			Recent :'最近使用',
+			nodata:'暂无数据',
+			Pleasecountry:'请先选择国家',
+			
 		},
 	},
 	//英语

pageA/comment.vue

@@ -1,30 +1,36 @@
 <template>
 	<!-- 评论 -->
 	<view class="back">
-		<view class="box" v-for="(item,idx) in commentlist" :key="idx">
-			<!-- 顶部 -->
-			<view class="" style="display: flex;justify-content: space-between;">
-				<view class="u-flex">
-					<image style="width: 68rpx;height: 68rpx;border: radius 34rpx;;" :src="item.member.avatar" mode="">
-					</image>
-					<view class="">
-						<text
-							class="name">{{item.member.nickname.slice(0,1)+'***'+item.member.nickname.slice(-1)}}</text>
-						<uni-rate network allow-half :readonly="true" color="rgba(247, 181, 0, 1)" :size='8' :value="5"
-							v-model="rate" />
+		<view class="" v-if="commentlist.length >0">
+			<view class="box" v-for="(item,idx) in commentlist" :key="idx">
+				<!-- 顶部 -->
+				<view class="" style="display: flex;justify-content: space-between;">
+					<view class="u-flex">
+						<image style="width: 68rpx;height: 68rpx;border: radius 34rpx;;" :src="item.member.avatar"
+							mode="">
+						</image>
+						<view class="">
+							<text
+								class="name">{{item.member.nickname.slice(0,1)+'***'+item.member.nickname.slice(-1)}}</text>
+							<uni-rate network allow-half :readonly="true" color="rgba(247, 181, 0, 1)" :size='8'
+								:value="5" v-model="rate" />
+						</view>
 					</view>
+					<text class="day">{{timeSince(item.created_at)}}</text>
+				</view>
+				<view class="day" style="margin-top: 24rpx;">{{item.sku_item.item}}</view>
+				<view class="content" style="margin-top: 20rpx;">{{item.content}}</view>
+				<!-- <view class="" v-for="(child,index) in item.image.split(',')" :key="index" style="margin-top: 22rpx;"> -->
+				<view class="u-flex u-row-between" style="margin-top: 22rpx;flex-wrap: wrap;" v-if="item.image">
+					<image v-for="(child,index) in item.image.split(',')" :key="index" :src="child"
+						style="margin-bottom: 20rpx; width: 326rpx;height: 326rpx;border-radius: 12rpx;background: #D8D8D8;"
+						mode=""></image>
 				</view>
-				<text class="day">{{timeSince(item.created_at)}}</text>
-			</view>
-			<view class="day" style="margin-top: 24rpx;">{{item.sku_item.item}}</view>
-			<view class="content" style="margin-top: 20rpx;">{{item.content}}</view>
-			<!-- <view class="" v-for="(child,index) in item.image.split(',')" :key="index" style="margin-top: 22rpx;"> -->
-			<view class="u-flex u-row-between" style="margin-top: 22rpx;flex-wrap: wrap;">
-				<image v-for="(child,index) in item.image.split(',')" :key="index" :src="child"
-					style="margin-bottom: 20rpx; width: 326rpx;height: 326rpx;border-radius: 12rpx;background: #D8D8D8;"
-					mode=""></image>
 			</view>
 		</view>
+		<view class="" style="height: 400rpx;text-align: center;line-height: 400rpx;">
+			暂无数据
+		</view>
 	</view>
 </template>
 
@@ -41,6 +47,9 @@
 			this.merchant_goods_id = options.id
 			this.comment()
 		},
+		onshow() {
+
+		},
 		computed: {
 			i18n() {
 				return this.$t('index')
@@ -52,10 +61,10 @@
 				uni.$u.http.post('/api/goods/goods_comment', {
 					merchant_goods_id: this.merchant_goods_id,
 					page: 1,
-					limit: 2
+					limit: 10
 				}).then((res) => {
+					console.log(res);
 					this.commentlist = res.data
-					this.total = res.total
 				}).catch(() => {
 
 				})

pageA/productdetails.vue

@@ -124,7 +124,7 @@
 					<view class="" v-for="(item, idx) in commentlist" :key="idx">
 						<view class="uesr u-flex u-row-between" style="margin-top: 36rpx">
 							<view class="u-flex">
-								<image src="../static/images/logo.png" style="width: 52rpx; height: 52rpx" mode="">
+								<image :src=" item.member.avatar " style="width: 52rpx; height: 52rpx" mode="">
 								</image>
 								<text class="name">{{ item.member.nickname }}</text>
 							</view>
@@ -228,7 +228,18 @@
 						</view>
 					</view>
 					<view class="" style="margin-top: 28rpx;">
-						<u-parse :content="goodinfo.detail_cn"></u-parse>
+						<view v-if="language == 'zh-CN'" class="">
+							<u-parse :content="goodinfo.detail_cn"></u-parse>
+						</view>
+						<view v-if="language == 'en-US'" class="">
+							<u-parse :content="goodinfo.detail_en"></u-parse>
+						</view>
+						<view v-if="language == 'es-ES'" class="">
+							<u-parse :content="goodinfo.detail_es"></u-parse>
+						</view>
+						<view v-if="language == 'it-IT'" class="">
+							<u-parse :content="goodinfo.detail_ita"></u-parse>
+						</view>
 						<!-- <image :src="goodinfo.image" style="width: 100%; height: 580rpx" mode=""></image> -->
 					</view>
 				</view>
@@ -572,18 +583,17 @@
 			//保存到手机相册
 			saveImage() {
 				var that = this
-				console.log('this.picture2.slice,-1)',this.picture2.slice(23));
+				console.log('this.picture2.slice,-1)', this.picture2.slice(23));
 				var fileManager = uni.getFileSystemManager();
 				fileManager.writeFile({
 					filePath: wx.env.USER_DATA_PATH + '/img.jpg', // 指定图片的临时路径
-					data:this.picture2.slice(23), // 要写入的文本或二进制数据
+					data: this.picture2.slice(23), // 要写入的文本或二进制数据
 					encoding: 'base64', // 指定写入文件的字符编码
 					success: res => {
-						console.log('写入文件成功', res)
 						console.log(wx.env.USER_DATA_PATH + '/img.jpg')
 						uni.saveImageToPhotosAlbum({ // 保存图片到相册
 							filePath: wx.env.USER_DATA_PATH + '/img.jpg',
-							success: function(res) { 
+							success: function(res) {
 								uni.showToast({
 									title: '保存成功'
 								})
@@ -593,7 +603,7 @@
 								console.log('保存失败', err)
 								that.imagea = false
 							},
-							
+
 						})
 					},
 					file: err => {
@@ -609,9 +619,10 @@
 				this.serve = true
 			},
 			returnindex() {
-				uni.switchTab({
-					url: '/pages/index/index'
-				})
+				// uni.switchTab({
+				// 	url: '/pages/index/index'
+				// })
+				uni.navigateBack()
 			},
 			chat() {
 				uni.navigateTo({

pageB/ParcelExpress.vue

@@ -6,7 +6,7 @@
 			<image src="/static/images/index/back.png"
 				style="width: 750rpx;height: 1200rpx;position: absolute;top: 0;z-index: -1;left:-24rpx;" mode="">
 			</image>
-			<u-navbar :autoBack='true' title='寄快递' bgColor="rgba(248, 50, 36, 0.2)" :placeholder='true'
+			<u-navbar :autoBack='true' :title='i18n.delivery' bgColor="rgba(248, 50, 36, 0.2)" :placeholder='true'
 				:safeAreaInsetTop="true" style="position: absolute;z-index: 110;background-color: rgba(0,0,0,0);">
 				<view class="u-nav-slot" slot="left" style="display: flex;">
 					<u-icon name="arrow-left" color="rgba(0, 0, 0, 1)" size="24" @click="uni.navigateBack()"></u-icon>

pageB/citychange.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- 选择城市 -->
 	<view class="page-main">
-		<liu-indexed-list :dataList="dataList" @click="click"></liu-indexed-list>
+		<liu-indexed-list :dataList="dataList"  @click="click"></liu-indexed-list>
 	</view>
 </template>
 
@@ -9,64 +9,34 @@
 	export default {
 		data() {
 			return {
-				dataList: [{
-					id: '1',
-					name: '刘**',
-					phone: '181****5576',
-					img: 'https://cdn.pixabay.com/photo/2022/03/31/14/53/camp-7103189_1280.png'
-				}, {
-					id: '2',
-					name: '税**',
-					phone: '181****5576',
-					img: 'https://cdn.pixabay.com/photo/2021/07/22/11/25/rabbit-6485072_1280.jpg'
-				}, {
-					id: '3',
-					name: '柴**',
-					phone: '181****5576',
-					img: 'https://cdn.pixabay.com/photo/2020/05/19/13/35/cartoon-5190860_1280.jpg'
-				}, {
-					id: '4',
-					name: '王**',
-					phone: '181****5576',
-					img: 'https://cdn.pixabay.com/photo/2020/05/19/13/32/cartoon-5190837_1280.jpg'
-				}, {
-					id: '5',
-					name: '马**',
-					phone: '181****5576',
-					img: 'https://cdn.pixabay.com/photo/2023/03/07/12/45/child-7835677_1280.jpg'
-				}, {
-					id: '6',
-					name: '韩**',
-					phone: '181****5576',
-					img: 'https://cdn.pixabay.com/photo/2022/11/29/19/05/boho-7625140_1280.jpg'
-				}, {
-					id: '7',
-					name: '张**',
-					phone: '181****5576',
-					img: 'https://cdn.pixabay.com/photo/2020/05/19/13/32/cartoon-5190837_1280.jpg'
-				}, {
-					id: '8',
-					name: '王**',
-					phone: '181****5576',
-					img: 'https://cdn.pixabay.com/photo/2020/05/19/13/35/cartoon-5190860_1280.jpg'
-				}, {
-					id: '9',
-					name: '张**',
-					phone: '18198045576',
-					img: 'https://cdn.pixabay.com/photo/2021/07/22/11/25/rabbit-6485072_1280.jpg'
-				}, {
-					id: '10',
-					name: '李**',
-					phone: '181****5576',
-					img: 'https://cdn.pixabay.com/photo/2022/03/31/14/53/camp-7103189_1280.png'
-				}]
+				dataList: [],
+				searchlist:[],//搜索历史
 			};
 		},
-
+		onShow() {
+			this.getCountryList()
+			if(uni.getStorageSync('searchlist')){
+				this.searchlist = uni.getStorageSync('searchlist')
+			}
+		},
 		methods: {
+			//根据国家获取城市
+			getCountryList() {
+				uni.$u.http.get(`/api/area?is_domestic=0&pid=`).then((res) => {
+					this.dataList = res;
+				});
+			},
 			//点击列表回调事件
 			click(e) {
-				console.log('点击列表回调：', e)
+				const eventchannel = this.getOpenerEventChannel();
+				eventchannel.emit('getadd', e)
+				if(this.searchlist.includes(e)){
+					
+				}else{
+					this.searchlist.unshift(e)
+					uni.setStorageSync('searchlist',this.searchlist.slice(0,6))
+				}
+				uni.navigateBack()
 			}
 		}
 	}

pageB/recipientinfo.vue

@@ -8,51 +8,51 @@
 			<view class="item u-flex " @click="tocitychange">
 				<text class="left">{{i18n.country}}</text>
 				<view class="right u-flex u-row-between" style="flex: 1;">
-					<input type="text" :placeholder="i18n.selection" />
+					<input type="text" :placeholder="i18n.selection" v-model="addname" />
 					<image src="../static/express/next1.png" style="width: 36rpx;height: 36rpx;" mode=""></image>
 				</view>
 			</view>
 			<view class="item u-flex ">
 				<text class="left">{{i18n.name}}</text>
 				<view class="right">
-					<input type="text" placeholder="请输入收件人姓名" />
+					<input type="text" :placeholder="i18n.name" v-model="name" />
 				</view>
 			</view>
 			<view class="item u-flex ">
 				<text class="left">{{i18n.phone}}</text>
 				<view class="right">
-					<input type="text" :placeholder="i18n.pleasePhoneNumber" />
+					<input type="text" :placeholder="i18n.pleasePhoneNumber" v-model="phone" />
 				</view>
 			</view>
 			<view class="item u-flex ">
 				<text class="left">{{i18n.postalCode}}</text>
 				<view class="right">
-					<input type="text" :placeholder="i18n.PleacePostalCode" />
+					<input type="text" :placeholder="i18n.PleacePostalCode" v-model="postalCode" />
 				</view>
 			</view>
 			<view class="item u-flex ">
 				<text class="left">{{i18n.city}}</text>
-				<view class="right u-flex u-row-between " style="flex: 1;">
-					<input type="text" :placeholder="i18n.selection" disabled="" />
+				<view class="right u-flex u-row-between " style="flex: 1;" @click="openCity">
+					<input type="text" :placeholder="i18n.selection" disabled="" v-model="cityname" />
 					<image src="../static/express/next1.png" style="width: 36rpx;height: 36rpx;" mode=""></image>
 				</view>
 			</view>
 			<view class="item u-flex ">
 				<text class="left">{{i18n.detailed}}</text>
 				<view class="right">
-					<input type="area" :placeholder="i18n.sect" />
+					<input type="area" :placeholder="i18n.sect" v-model="detailed" />
 				</view>
 			</view>
 			<view class="item u-flex ">
 				<text class="left">{{i18n.companyName}}</text>
 				<view class="right">
-					<input type="area" :placeholder="i18n.company" />
+					<input type="area" :placeholder="i18n.company" v-model="companyName" />
 				</view>
 			</view>
 			<view class="item u-flex ">
 				<text class="left">{{i18n.email}}</text>
 				<view class="right">
-					<input type="area" :placeholder="i18n.pleaseEmail" />
+					<input type="area" :placeholder="i18n.pleaseEmail" v-model="email" />
 				</view>
 			</view>
 			<!-- 默认地址 -->
@@ -60,7 +60,7 @@
 				<view class="u-flex">
 					<view class="">
 						<u-checkbox-group v-model="checkboxValue1" placement="row" @change="checkboxChange">
-							<u-checkbox shape='circle' :customStyle="{marginRight: '4px'}" :name="name">
+							<u-checkbox shape='circle' :customStyle="{marginRight: '4px'}" :name="active">
 							</u-checkbox>
 						</u-checkbox-group>
 					</view>
@@ -73,10 +73,13 @@
 		</view>
 		<view class="" style="height: 166rpx;"></view>
 		<view class="bottom">
-			<view class="btn">
+			<view class="btn" @click="submit">
 				{{i18n.enter}}
 			</view>
 		</view>
+		<!-- 选择省市区 -->
+		<u-picker :show="show" :columns="cityList" keyName="name" @confirm="countrycConfirm" @cancel="show = false"
+			:closeOnClickOverlay="true" @close="close"></u-picker>
 	</view>
 </template>
 
@@ -85,18 +88,94 @@
 		data() {
 			return {
 				checkboxValue1: [],
-				name: 1
+				active: 1,
+				addname: '',
+				addid: '',
+				show: false,
+				cityList: [],
+				cityid: '',
+				cityname: "",
+
+				name: "",
+				phone: "",
+				postalCode: "",
+				detailed: "",
+				email: "",
+				companyName: "",
+				is_default:0
 			};
 		},
 		methods: {
+			//确定
+			submit() {
+				const obj = {
+					mobile: this.phone,
+					name: this.name,
+					country_id: this.addid,
+					province_id: this.cityid,
+					address: this.detailed,
+					company_name: this.companyName,
+					email: this.email,
+					zip_code: this.postalCodee,
+					is_default:this.is_default
+				};
+				uni.$u.http.post(`/api/address`, obj).then((res) => {
+					console.log(res);
+					// this.$router.back();
+				});
+			},
+			//选择省市区
+			countrycConfirm(e) {
+				console.log(e);
+				this.cityid = e.value[0].id
+				this.cityname = e.value[0].name
+				this.show = false;
+			},
+			//打开选择城市的弹窗
+			openCity() {
+				//判断是否选择国家
+				if (this.addid) {
+					this.show = true
+					//判断选中的国家有没有城市数据
+					// if (this.cityList[0].length > 0) {
+					//   this.show = true;
+					// } else {
+					//   uni.$u.toast("该国家没有城市数据，请直接填写详细地址");
+					// }
+				} else {
+					uni.$u.toast("请先选择国家");
+				}
+			},
 			checkboxChange(n) {
 				console.log('change', n);
+				if(n.length>0){
+					this.is_default = 1
+				}else{
+					this.is_default = 0
+				}
 			},
-			tocitychange(){
+			//获取国家
+			tocitychange() {
+				var that = this
 				uni.navigateTo({
-					url:'/pageB/citychange'
+					url: '/pageB/citychange',
+					events: {
+						getadd(res) {
+							console.log(res.id);
+							that.addid = res.id
+							that.addname = res.name
+							that.getCityList()
+						}
+					}
 				})
-			}
+			},
+			//根据国家获取城市
+			getCityList() {
+				uni.$u.http.get(`/api/area/tree?pid=` + this.addid).then((res) => {
+					this.cityList = [res];
+					console.log(this.cityList);
+				});
+			},
 		},
 		computed: {
 			i18n() {

uni_modules/liu-indexed-list/components/liu-indexed-list/liu-indexed-list.vue

@@ -4,25 +4,26 @@
 			:scroll-into-view="scrollIntoView">
 			<view class="liu-search" id="TOP">
 				<image class="liu-search-img" src="../../static/search.png"></image>
-				<input class="liu-input" @input="search" v-model="searchStr" placeholder="请输入国家或地区中文名称" maxlength="50"
+				<input class="liu-input" @input="search" v-model="searchStr" placeholder="请输入国家" maxlength="50"
 					placeholder-class="liu-placeholder" />
 			</view>
 			<view class="" style="padding: 24rpx ;background-color: #fff;">
 				<view class="use">最近使用</view>
-				<view class="" style="margin-top: 24rpx;">
-					<view class="item" style="display: inline; " @click="tosearch">
-						马拉西亚
+				<view class="" style="margin-top: 24rpx;column-gap: 10rpx;display: flex;flex-wrap: wrap;">
+					<view class="item" style=" " @click="tosearch(item)"
+						v-for="(item,idx) in searchlist" :key="idx">
+						{{item.name}}
 					</view>
 				</view>
 			</view>
 			<view class="left-list" v-for="(item,index) of scrollLeftObj" :key="index" :id="index!='#'?index:'BOTTOM'">
 				<view class="left-item-title" v-if="item && item.length">{{index}}</view>
 				<view class="left-item-card" v-for="(mess,inx) in item" @click.stop="chooseItem(mess)">
-					<image :style="'border-radius:'+radius" class="left-item-card-img img-info" :src="mess[imgKey]"
+					<!-- 				<image :style="'border-radius:'+radius" class="left-item-card-img img-info" :src="mess[imgKey]"
 						v-if="mess[imgKey]" @click.stop="preview(mess[imgKey])"></image>
 					<view :style="'border-radius:'+radius" class="left-item-card-img" v-else>
 						{{mess[nameKey] && mess[nameKey].slice(0,1) || ''}}
-					</view>
+					</view> -->
 					<view class="left-item-card-info"
 						:style="inx<item.length-1?'border-bottom: solid #F4F4F4 1rpx;':''">
 						<view class="left-item-card-name">{{mess[nameKey] || ''}}</view>
@@ -91,9 +92,15 @@
 				scrollLeftObj: {},
 				oldObj: {},
 				scrollRightList: [],
-				hasData: true
+				hasData: true,
+				searchlist:[]
 			};
 		},
+		mounted() {
+			if (uni.getStorageSync('searchlist')) {
+				this.searchlist = uni.getStorageSync('searchlist')
+			}
+		},
 		watch: {
 			dataList: {
 				immediate: true,
@@ -104,8 +111,8 @@
 			},
 		},
 		methods: {
-			tosearch(){
-				this.searchStr = 111
+			tosearch(item) {
+				this.searchStr = item.name
 				this.search()
 			},
 			search() {
@@ -212,9 +219,11 @@
 		font-weight: 400;
 		font-size: 28rpx;
 		color: #222222;
-		line-height: 60rpx;
+		// line-height: 60rpx;
 		text-align: center;
 		font-style: normal;
+		margin-bottom: 10rpx;
+		box-sizing: border-box;
 	}
 
 	.liu-list {