解决冲突

commont/messages.js

@@ -43,11 +43,42 @@ export default {
 			country:"国家",
 			postalCode:"邮编",
 			email:"电子邮箱",
+			companyName:"公司名称",
+			selection:"请选择",
+			PleacePostalCode:"请输入邮编",
+			addressBook:"保存到地址薄",
+			pleaseEmail:"请输入电子邮箱（选填）",
+			editPassword:"修改登录密码",
+			editPhone:"修改手机号",
+			accountCancellation:"账号注销",
+			setPassword:"设置密码",
+			cancellation:"注销后无法恢复，请谨慎操作",
+			myDeposit:"我的保证金",
+			balance:"余额",
+			mineFollow:"我的关注",
+			myPackage:"我的包裹",
+			mallOrders:"商城订单",
+			whole:"全部",
+			pendingPayment:"待付款",
+			joiningGroups:"拼团中",
+			toBeShipped:"待发货",
+			toBeReceived:"待收货",
+			refund:"退款/售后",
+			leaderunction:"团长功能",
+			platform:"平台商品库",
+			productManagement:"商品管理",
+			orderManagement:"订单管理",
+			afterSales:"售后管理",
+			supplyChain:"供应链商品",
+			PCEnd:"PC端",
+			pontact:"联系客服",
+			accountSettings:"账号设置",
+			
 		}
 	},
 	"en-US": {
 		index: {
-			homepage: 'homepage',
+			homepage: 'Homepage',
 			switchLanguage: "Switch Language",
 			address: "Address Management",
 			addAndEdit: "add/modify Address",
@@ -89,6 +120,36 @@ export default {
 			country:"Country",
 			postalCode:"Postal code",
 			email:"E-mail",
+			companyName:"Company Name",
+			selection:"Please Select",
+			PleacePostalCode:"Please enter your postal code",
+			addressBook:"Save to Address Book",
+			pleaseEmail:"Please enter your email address (optional)",
+			cancellation:"Unable to recover after logging out, please operate with caution",
+			editPassword:"Change login password",
+			editPhone:"Change phone number",
+			accountCancellation:"Account Cancellation",
+			setPassword:"Set password",
+			myDeposit:"My deposit",
+			balance:"Balance",
+			mineFollow:"My following",
+			myPackage:"My Package",
+			mallOrders:"Mall orders",
+			whole:"Whole",
+			pendingPayment:"Pending payment",
+			joiningGroups:"Joining groups",
+			toBeShipped:"To be shipped",
+			toBeReceived:"To be received",
+			refund:"Refund/After sales",
+			leaderunction:"Leader function",
+			platform:"Platform product library",
+			productManagement:"Product Management",
+			orderManagement:"order management",
+			afterSales:"After sales",
+			supplyChain:"Supply chain goods",
+			PCEnd:"PC end",
+			pontact:"Contact customer service",
+			accountSettings:"Account Settings",
 		}
 	}
 }

pageC/accountCancellation/accountCancellation.vue

@@ -0,0 +1,48 @@
+<template>
+	<view class="page">
+
+		<view style="margin-bottom: 40rpx;">在注销账户前，请您进行以下风险确认:</view>
+
+		<view> 1.请您注意在【我-钱包]中确认您是否存在尚未使用或提现的余额、优惠券等权益，我们建议您在注销前妥当处理您的资产，例如提现至银行卡、使用相关权益等。</view>
+		<view> 2.请您务必审慎阅读关于您权益的重要提示，确保在您注销账号时已处理完毕权益。</view>
+		<button class="btn">注销账号</button>
+		<view class="cancellation">
+			注销后账户不可恢复，请谨慎操作
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	
+	.page {
+		background-color: #fff;
+		height: 92.5vh;
+		padding: 54rpx 44rpx;
+		font-size: 30rpx;
+		color: rgba(34, 34, 34, .7);
+		.btn{
+			background-color: #f83224;
+			border-radius: 44rpx;
+			color: #fff;
+			margin-top: 108rpx
+		}
+		.cancellation{
+			font-size: 24rpx;
+			text-align: center;
+			margin-top: 32rpx;
+		}
+	}
+</style>

pageC/accountSecurity/accountSecurity.vue

@@ -0,0 +1,85 @@
+<template>
+	<view class="page">
+		<view class="content-top">
+			<view class="first">
+				<text>{{i18n.editPassword}}</text>
+				<textRight :texts="i18n.setPassword" />
+			</view>
+			<view class="first">
+				<text>{{i18n.editPhone}}</text>
+				<textRight texts="178****0000" />
+			</view>       
+		</view>
+		<view class="content-bottom">
+			<view class="first" @click="toCancellation">
+				<text>{{i18n.accountCancellation}}</text>
+				<textRight :texts="i18n.cancellation" />
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import textRight from "./component/textRight.vue"
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		components: {
+			textRight
+		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
+		methods: {
+			toCancellation(){
+				uni.navigateTo({
+					url:"/pageC/accountCancellation/accountCancellation"
+				})
+			}
+		},
+		mounted() {
+			uni.setNavigationBarTitle({
+				title: this.i18n.account
+			})
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.page {
+		padding: 20rpx 24rpx;
+
+		.content-top {
+			background-color: #fff;
+			border-radius: 16rpx;
+			padding: 0 24rpx;
+
+			.first {
+				height: 108rpx;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				border-bottom: 2rpx solid rgba(151, 151, 151, .1);
+			}
+		}
+		.content-bottom{
+			
+				background-color: #fff;
+				border-radius: 16rpx;
+				padding: 0 24rpx;
+				margin-top: 20rpx;
+				.first {
+					height: 108rpx;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					border-bottom: 2rpx solid rgba(151, 151, 151, .1);
+				}
+		}
+	}
+</style>

pageC/accountSecurity/component/textRight.vue

@@ -0,0 +1,33 @@
+<template>
+	<view class="text-right">
+		<text>{{texts}}</text>
+		<image class="text-icon" src="../../../static/mine/325.png" mode=""></image>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return{}
+		},
+		props:{
+			texts:{
+				typeof:String,
+				default:""
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.text-right{
+		display: flex;
+		align-items: center;
+		color: rgba(34, 34, 34, .5);
+		font-size: 30rpx;
+		.text-icon{
+			height: 32rpx;
+			width: 32rpx;
+		}
+	}
+</style>

pageC/accountSetup/accountSetup.vue

@@ -23,7 +23,7 @@
 		</view>
 
 		<view class="set-center">
-			<view class="security">
+			<view class="security" @click="toNextPage('/pageC/accountSecurity/accountSecurity')">
 				<text>{{i18n.account}}</text>
 				<view class="text-right">
 					<text>{{i18n.password}}</text>
@@ -41,7 +41,7 @@
 				<text>{{i18n.user}}</text>
 				<image src="../../static/mine/325.png" class="right-icon" mode=""></image>
 			</view>
-			<view class="text-1">
+			<view class="text-1" @click="toNextPage('/pageC/privacyPolicy/privacyPolicy')">
 				<text>{{i18n.privacy}}</text>
 				<image src="../../static/mine/325.png" class="right-icon" mode=""></image>
 			</view>

pageC/applicationRefund/applicationRefund.vue

@@ -0,0 +1,228 @@
+<template>
+	<view class="page">
+		<view class="commodity-information">
+			<view class="commodity-1">
+				<image class="commodity-img"
+					src="https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/156939/24/43697/126104/6619de23F69802006/8432635baed61875.jpg.webp"
+					mode=""></image>
+				<view class="commodity-right">
+					<view class="commodity-2">
+						<view class="commodity-title">
+							OATLY 噢麦力 醇香燕麦…
+						</view>
+
+					</view>
+
+					<view class="commodity-3">
+						<view class="specifications">
+							【醇香】250ml*3
+						</view>
+						<view style="font-size: 24rpx;">
+							x1
+						</view>
+					</view>
+					<view class="commodity-price">
+						<text style="font-size: 20rpx;">￥</text>
+						<text>133</text>.
+						<text style="font-size: 20rpx;">22</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="reason">
+			<view class="application-reason">
+				<view class="">
+					申请原因
+				</view>
+				<view class="right" @click="openReason">
+					<text>{{refundText}}</text>
+					<image class="right-icon" src="../../static/mine/325.png" mode=""></image>
+				</view>
+			</view>
+
+			<view class="application-reason">
+				<view class="">
+					退款金额
+				</view>
+				<view class="commodity-price">
+					<text style="font-size: 20rpx;">￥</text>
+					<text>133</text>.
+					<text style="font-size: 20rpx;">22</text>
+				</view>
+			</view>
+		</view>
+		
+		<view class="application-explain">
+			<view class="application-title">
+				申请说明
+			</view>
+			<view class="textarea">
+				<u--textarea v-model="value1" border="none"  placeholder="请您详细填写申请说明" ></u--textarea>
+			
+			<u-upload
+				:fileList="fileList6"
+				@afterRead="afterRead"
+				@delete="deletePic"
+				name="6"
+				multiple
+				:maxCount="1"
+				width="250"
+				height="150"
+			>
+				
+				<view class="unload">
+					<view class="text-content">
+						上传凭证<br/>(最多9张)
+					</view>
+					
+				</view>
+			</u-upload>
+			</view>
+		</view>
+		<reasonPopupVue :show="show" @close="close"></reasonPopupVue>
+	</view>
+</template>
+
+<script>
+	import reasonPopupVue from './component/reasonPopup.vue';
+	export default {
+		components: {
+			reasonPopupVue
+		},
+		data() {
+			return {
+				show: false,
+				value1:"",
+				refundText:"请选择退款原因"
+			};
+		},
+		methods: {
+			openReason() {
+				this.show = true
+			},
+			close(value) {
+				console.log(value)
+				this.refundText = value
+				this.show = false
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		padding: 20rpx 24rpx;
+
+		.commodity-information {
+			padding: 28rpx 20rpx;
+			background-color: #fff;
+			border-radius: 16rpx;
+
+			.commodity-1 {
+				display: flex;
+
+				.commodity-img {
+					width: 156rpx;
+					height: 156rpx;
+					margin-right: 20rpx;
+					border-radius: 10rpx;
+				}
+
+				.commodity-right {
+					width: 73%;
+				}
+
+				.commodity-2 {
+					display: flex;
+					justify-content: space-between;
+					width: 100%;
+
+					.commodity-title {
+						width: 328rpx;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+						margin-right: 38rpx;
+					}
+				}
+
+				.commodity-3 {
+					display: flex;
+					justify-content: space-between;
+					margin-top: 20rpx;
+					color: #777;
+
+					.specifications {
+						font-size: 28rpx;
+						color: #777;
+					}
+				}
+
+				.commodity-price {
+					margin-top: 24rpx;
+				}
+			}
+		}
+
+		.reason {
+			background-color: #fff;
+			padding: 0 20rpx;
+			border-radius: 16rpx;
+			margin-top: 20rpx;
+
+			.application-reason {
+				display: flex;
+				justify-content: space-between;
+				height: 104rpx;
+				align-items: center;
+				font-size: 28rpx;
+
+				.right {
+					display: flex;
+					align-items: center;
+					color: rgba(34, 34, 34, .6);
+					font-size: 28rpx;
+				}
+
+				.right-icon {
+					width: 32rpx;
+					height: 32rpx;
+				}
+			}
+
+		}
+		.application-explain{
+			margin-top: 20rpx;
+			padding: 28rpx 20rpx;
+			background-color: #fff;
+			border-radius: 16rpx;
+			.application-title{
+				font-size: 28rpx;
+				color: #222;
+				margin-bottom: 18rpx;
+			}
+			.textarea{
+				background-color: #f4f4f4;
+				padding: 24rpx;
+				border-radius: 16rpx;
+			}
+			.unload{
+				width: 614rpx;
+				height: 152rpx;
+				text-align: center;
+				border-radius: 16rpx;
+				color: #929292;
+				border: 2rpx dashed #979797;
+				font-size: 20rpx;
+				.text-content{
+					margin-top: 80rpx;
+				}
+			}
+		}
+	}
+	.u-textarea{
+		background-color: #f4f4f4;
+		padding: 0;
+	}
+</style>

pageC/applicationRefund/component/reasonPopup.vue

@@ -0,0 +1,74 @@
+<template>
+	<view class="">
+		<u-popup :show="show" @close="$emit('close')" round="16rpx" @open="open" closeable closeOnClickOverlay>
+			<view class="title">
+				申请原因
+			</view>
+			<view class="radio-list">
+				<u-radio-group v-model="value" @change="handleChange" iconPlacement="right" placement="column">
+					<view class="radio">
+						<u-radio activeColor="red" name="拍错/多拍/不喜欢" label="拍错/多拍/不喜欢"></u-radio>
+					</view>
+					<view class="radio">
+						<u-radio activeColor="red" name="商品与页面描述不符" label="商品与页面描述不符"></u-radio>
+					</view>
+					<view class="radio">
+						<u-radio activeColor="red" name="商品破损/包装问题" label="商品破损/包装问题"></u-radio>
+					</view>
+					<view class="radio">
+						<u-radio activeColor="red" name="收货地址/手机号填错了" label="收货地址/手机号填错了"></u-radio>
+					</view>
+					<view class="radio">
+						<u-radio activeColor="red" name="卖家发错货" label="卖家发错货"></u-radio>
+					</view>
+					<view class="radio">
+						<u-radio activeColor="red" name="其他原因" label="其他原因"></u-radio>
+					</view>
+				</u-radio-group>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			show: {
+				typeof: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				value:'',
+				
+			}
+		},
+		methods: {
+			open() {},
+			handleChange(name){
+				console.log(this.value)
+				this.$emit('close',name)
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.title {
+		text-align: center;
+		font-size: 36rpx;
+		color: #222;
+		font-weight: 500;
+		margin-top: 20rpx;
+	}
+
+	.radio-list {
+		padding: 0 28rpx;
+		margin-top: 40rpx;
+	}
+
+	.radio {
+		margin-bottom: 48rpx;
+	}
+</style>

pageC/internationalAddress/internationalAddress.vue

@@ -6,58 +6,64 @@
 			</view>
 			<!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
 			<u--form labelPosition="left" :model="model1" ref="uForm">
-				<u-form-item labelWidth="150rpx" :label="i18n.country"  borderBottom ref="item1">
-					<u--input v-model="model1.userInfo.name" :placeholder="i18n.goods" border="none"></u--input>
+				<u-form-item labelWidth="150rpx" @click="showDialog = true" :label="i18n.country" borderBottom
+					ref="item1">
+
+					<u--input v-model="model1.userInfo.sex" disabled disabledColor="#ffffff"
+						:placeholder="i18n.selection" border="none"></u--input>
+					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
-				<u-form-item labelWidth="150rpx" :label="i18n.name"  borderBottom ref="item1">
+				<u-form-item labelWidth="150rpx" :label="i18n.name" borderBottom ref="item1">
 					<u--input v-model="model1.userInfo.name" :placeholder="i18n.goods" border="none"></u--input>
 				</u-form-item>
 
-				<u-form-item labelWidth="150rpx" :label="i18n.phone"  borderBottom ref="item1">
-					<u--input v-model="model1.userInfo.name" :placeholder="i18n.pleasePhoneNumber" border="none"></u--input>
+				<u-form-item labelWidth="150rpx" :label="i18n.phone" borderBottom ref="item1">
+					<u--input v-model="model1.userInfo.name" :placeholder="i18n.pleasePhoneNumber"
+						border="none"></u--input>
 				</u-form-item>
-				
-					<u-form-item labelWidth="150rpx" :label="i18n.postalCode"  borderBottom ref="item1">
-						<u--input v-model="model1.userInfo.name" :placeholder="i18n.goods" border="none"></u--input>
-					</u-form-item>
-				<u-form-item labelWidth="150rpx" :label="i18n.city"  borderBottom
-					@click="show = true" ref="item1">
-					<u--input v-model="model1.userInfo.sex" disabled disabledColor="#ffffff" :placeholder="i18n.township"
+				<u-form-item labelWidth="150rpx" :label="i18n.postalCode" borderBottom ref="item1">
+					<u--input v-model="model1.userInfo.name" :placeholder="i18n.PleacePostalCode"
 						border="none"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="150rpx" :label="i18n.city" borderBottom @click="show = true" ref="item1">
+					<u--input v-model="model1.userInfo.sex" disabled disabledColor="#ffffff"
+						:placeholder="i18n.township" border="none"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
 
-				<u-form-item labelWidth="150rpx" :label="i18n.detailed"  borderBottom ref="item1">
+				<u-form-item labelWidth="150rpx" :label="i18n.detailed" borderBottom ref="item1">
 					<u--input v-model="model1.userInfo.name" :placeholder="i18n.sect" border="none"></u--input>
 				</u-form-item>
-				
-				<u-form-item labelWidth="150rpx" :label="i18n.detailed"  borderBottom ref="item1">
+
+				<u-form-item labelWidth="150rpx" :label="i18n.companyName" borderBottom ref="item1">
 					<u--input v-model="model1.userInfo.name" :placeholder="i18n.company" border="none"></u--input>
 				</u-form-item>
-				<u-form-item labelWidth="150rpx" :label="i18n.email"  borderBottom ref="item1">
-					<u--input v-model="model1.userInfo.name" :placeholder="i18n.sect" border="none"></u--input>
+				<u-form-item labelWidth="150rpx" :label="i18n.email" borderBottom ref="item1">
+					<u--input v-model="model1.userInfo.name" :placeholder="i18n.pleaseEmail" border="none"></u--input>
 				</u-form-item>
 				<view style="display: flex;justify-content: space-between;align-items: center;">
 					<view class="item-left">
 						<image src="../../static/mine/330.png" class="address-icon" mode=""></image>
-						<text>{{ i18n.initial }}</text>
+						<text>{{ i18n.addressBook }}</text>
 					</view>
 					<text style="font-size: 24rpx; color: #333;">{{i18n.empty}}</text>
 				</view>
 			</u--form>
 
 		</view>
-		<SelectCity :show="show" @close="close"/>
+		<SelectCity :show="show" @close="close" />
 		<view class="footer">
 			<button class="save">{{i18n.preserve}}</button>
 		</view>
+
+		<u-picker :show="showDialog" :columns="columns" ></u-picker>
 	</view>
 </template>
 
 <script>
 	import SelectCity from '../addEditAddress/component/selectCity.vue';
 	export default {
-		components:{
+		components: {
 			SelectCity
 		},
 		computed: {
@@ -68,6 +74,7 @@
 		data() {
 			return {
 				show: false,
+				showDialog: false,
 				model1: {
 					userInfo: {
 						name: '',
@@ -96,14 +103,15 @@
 				this.model1.userInfo.sex = e.name
 				this.$refs.uForm.validateField('userInfo.sex')
 			},
-			close(){
+			close() {
 				this.show = false
+				this.showDialog = false
 			}
 		},
 		mounted() {
-				uni.setNavigationBarTitle({
-					title:this.i18n.newAddress
-				})
+			uni.setNavigationBarTitle({
+				title: this.i18n.newAddress
+			})
 		},
 		onReady() {
 			//如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。
@@ -169,7 +177,8 @@
 				margin-right: 10rpx;
 			}
 		}
-		.footer{
+
+		.footer {
 			background-color: #fff;
 			position: fixed;
 			bottom: 0;
@@ -177,7 +186,8 @@
 			width: 750rpx;
 			left: 0;
 			padding-top: 20rpx;
-			.save{
+
+			.save {
 				width: 702rpx;
 				margin: 0 auto;
 				background-color: #f83224;

pageC/myPackage/myPackage.vue

@@ -0,0 +1,38 @@
+<template>
+	<view>
+		<view class="top-search">
+			<u--input placeholder="请输入订单编号搜索" prefixIcon="search" shape="circle"
+				prefixIconStyle="font-size: 22px;color: #909399;background: #f4f4f4;"></u--input>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
+		created() {
+			uni.setNavigationBarTitle({
+				title: this.i18n.myPackage
+			})
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.top-search{
+		background-color: #fff;
+		padding: 20rpx 24rpx;
+	}
+	/deep/.u-input{
+		background-color: #f4f4f4;
+	}
+</style>

pageC/orderForm/component/orderInofrmation.vue

@@ -0,0 +1,174 @@
+<template>
+	<view class="detail" @click="$emit('toDetail')"> 
+		<view class="title">
+			<view class="title-left">
+				<image class="header-img"
+					src="https://tse4-mm.cn.bing.net/th/id/OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA?rs=1&pid=ImgDetMain"
+					mode=""></image>
+				<text>张三</text>
+				<image class="right-325" src="../../../static/mine/325.png" mode=""></image>
+			</view>
+			<text class="order-status">待付款</text>
+		</view>
+		<view class="commodity-information">
+			<view class="commodity-1">
+				<image class="commodity-img"
+					src="https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/156939/24/43697/126104/6619de23F69802006/8432635baed61875.jpg.webp"
+					mode=""></image>
+				<view class="">
+					<view class="commodity-2">
+						<view class="commodity-title">
+							OATLY 噢麦力 醇香燕麦…
+						</view>
+						<view class="commodity-price">
+							<text style="font-size: 20rpx;">￥</text>
+							<text>133</text>.
+							<text style="font-size: 20rpx;">22</text>
+						</view>
+					</view>
+
+					<view class="commodity-3">
+						<view class="specifications">
+							【醇香】250ml*3
+						</view>
+						<view style="font-size: 24rpx;">
+							x1
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="price">
+			<text>需付款</text>
+			<text style="font-size: 20rpx;">￥</text>
+			<text>133</text>.
+			<text style="font-size: 20rpx;">22</text>
+		</view>
+		<view class="btn-list">
+			<button class="status-1">取消订单</button><button class="status-2">继续付款</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import textRight from '../../accountSecurity/component/textRight.vue'
+	export default {
+		components: {
+			textRight
+		},
+		data() {
+			return {
+
+			}
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	.detail {
+		padding: 28rpx 20rpx;
+		background-color: #fff;
+		border-radius: 16rpx;
+		margin-top: 28rpx;
+
+		.title {
+			display: flex;
+			justify-content: space-between;
+
+			.title-left {
+				display: flex;
+				font-size: 32rpx;
+				align-items: center;
+
+				.header-img {
+					width: 36rpx;
+					height: 36rpx;
+					border-radius: 50%;
+					margin-right: 20rpx;
+				}
+
+				.right-325 {
+					width: 32rpx;
+					height: 32rpx;
+				}
+			}
+
+			.order-status {
+				color: #f83224;
+				font-size: 26rpx;
+			}
+		}
+
+		.commodity-information {
+			margin-top: 28rpx;
+
+			.commodity-1 {
+				display: flex;
+
+				.commodity-img {
+					width: 180rpx;
+					height: 180rpx;
+					margin-right: 20rpx;
+					 border-radius: 10rpx;
+				}
+
+				.commodity-2 {
+					display: flex;
+					justify-content: space-between;
+
+					.commodity-title {
+						width: 328rpx;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+						margin-right: 38rpx;
+					}
+				}
+				.commodity-3{
+					display: flex;
+					justify-content: space-between;
+					margin-top: 20rpx;
+						color: #777;
+					.specifications{
+						font-size: 28rpx;
+						color: #777;
+					}
+				}
+			}
+		}
+		.price{
+			display: flex;
+			justify-content: flex-end;
+			font-size: 28rpx;
+			align-items: flex-end;
+		}
+		.btn-list{
+			display: flex;
+			justify-content: flex-end;
+			margin-top: 34rpx;
+			.status-1{
+				background-color: #fff;
+				border-radius: 34rpx;
+				margin: 0;
+				padding: 0;
+				font-size: 28rpx;
+				color: #222;
+				width: 168rpx;
+				height: 68rpx;
+				margin-right: 20rpx;
+				border: 2rpx solid #979797;
+			}
+			.status-2{
+				background-color: #ffffff;
+				border-radius: 34rpx;
+				margin: 0;
+				padding: 0;
+				font-size: 28rpx;
+				color: #f83224;
+				width: 168rpx;
+				height: 68rpx;
+				border: 2rpx solid #f83224;
+			}
+		}
+	}
+</style>

pageC/orderForm/orderForm.vue

@@ -1,73 +1,123 @@
 <template>
 	<view>
-		<view class="uni-title uni-common-pl">地区选择器</view>
-		<view class="uni-list">
-			<view class="uni-list-cell">
-				<view class="uni-list-cell-left">
-					当前选择
+		<u-navbar @leftClick="rightClick" bgColor="#f4f4f4" :autoBack="true">
+			<view class="tab" slot="center">
+				<view style="width: 600rpx;">
+					<input type="text" placeholder="搜索我的订单" class="inp" />
 				</view>
-				<view class="uni-list-cell-db">
-					<picker @change="bindPickerChange" :value="index" :range="array">
-						<view class="uni-input">{{array[index]}}</view>
-					</picker>
+			</view>
+		</u-navbar>
+		<view class="content">
+			<view class="top-tab">
+				<view :class="{commodity:follow==1}" class="tab" @click="tabSwitch(1)">
+					全部
+				</view>
+				<view :class="{commodity:follow==2}" class="tab" @click="tabSwitch(2)">
+					待付款
+				</view>
+				<view :class="{commodity:follow==3}" class="tab" @click="tabSwitch(3)">
+					拼团中
+				</view>
+				<view :class="{commodity:follow==4}" class="tab" @click="tabSwitch(4)">
+					代发货
+				</view>
+				<view :class="{commodity:follow==5}" class="tab" @click="tabSwitch(5)">
+					待收货
+				</view>
+				<view :class="{commodity:follow==6}" class="tab" @click="tabSwitch(6)">
+					已完成
+				</view>
+				<view :class="{commodity:follow==7}" class="tab" @click="tabSwitch(7)">
+					退款/售后
 				</view>
 			</view>
+			<OrderInofrmation @toDetail="toDetail" />
 		</view>
 	</view>
 </template>
 
 <script>
+	import OrderInofrmation from './component/orderInofrmation.vue'
 	export default {
+		components: {
+			OrderInofrmation
+		},
 		data() {
-			const currentDate = this.getDate({
-				format: true
-			})
 			return {
-				title: 'picker',
-				array: ['中国', '美国', '巴西', '日本'],
-				index: 0,
-				date: currentDate,
-				time: '12:01'
+				follow: 1
 			}
 		},
 		computed: {
-			startDate() {
-				return this.getDate('start');
-			},
-			endDate() {
-				return this.getDate('end');
+			i18n() {
+				return this.$t("index")
 			}
 		},
 		methods: {
-			bindPickerChange: function(e) {
-				console.log('picker发送选择改变，携带值为', e.detail.value)
-				this.index = e.detail.value
+			rightClick() {
+				console.log(111)
 			},
-			bindDateChange: function(e) {
-				this.date = e.detail.value
+			tabSwitch(num) {
+				this.follow = num
 			},
-			bindTimeChange: function(e) {
-				this.time = e.detail.value
+			toDetail() {
+				uni.navigateTo({
+					url: "/pageC/orderFormDetail/orderFormDetail"
+				})
 			},
-			getDate(type) {
-				const date = new Date();
-				let year = date.getFullYear();
-				let month = date.getMonth() + 1;
-				let day = date.getDate();
+		},
+		mounted() {
+
 
-				if (type === 'start') {
-					year = year - 60;
-				} else if (type === 'end') {
-					year = year + 2;
-				}
-				month = month > 9 ? month : '0' + month;
-				day = day > 9 ? day : '0' + day;
-				return `${year}-${month}-${day}`;
-			}
 		}
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+	.inp {
+		background-color: #fff;
+		border-radius: 40rpx;
+		width: 402rpx;
+		padding: 0 20rpx;
+		height: 68rpx;
+	}
+
+	.content {
+		padding: 0 24rpx;
+	}
+
+	.top-tab {
+		margin-top: 180rpx;
+		display: flex;
+		justify-content: space-between;
+		overflow-y: auto;
+		// flex-shrink: 1;
+		width: 100vw;
 
+		.tab {
+			margin-right: 40rpx;
+			font-size: 26rpx;
+			color: rgba(34, 34, 34, .8);
+			flex-shrink: 0;
+			height: 44rpx;
+			display: flex;
+			align-items: flex-end;
+		}
+
+		.commodity {
+			position: relative;
+			font-weight: 600;
+			font-size: 32rpx;
+		}
+
+		.commodity::before {
+			content: '';
+			display: block;
+			height: 8rpx;
+			width: 100%;
+			background: linear-gradient(to right, #f83224, #fff);
+			position: absolute;
+			bottom: 5rpx;
+			opacity: 0.8;
+		}
+	}
 </style>

pageC/orderFormDetail/component/commodityDetail.vue

@@ -0,0 +1,230 @@
+<template>
+	<view class="detail">
+		<view class="title">
+			<view class="title-left">
+				<image class="header-img"
+					src="https://tse4-mm.cn.bing.net/th/id/OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA?rs=1&pid=ImgDetMain"
+					mode=""></image>
+				<text>张三</text>
+				<image class="right-325" src="../../../static/mine/325.png" mode=""></image>
+			</view>
+		</view>
+		<view class="commodity-information">
+			<view class="commodity-1">
+				<image class="commodity-img"
+					src="https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/156939/24/43697/126104/6619de23F69802006/8432635baed61875.jpg.webp"
+					mode=""></image>
+				<view class="">
+					<view class="commodity-2">
+						<view class="commodity-title">
+							OATLY 噢麦力 醇香燕麦…
+						</view>
+						<view class="commodity-price">
+							<text style="font-size: 20rpx;">￥</text>
+							<text>133</text>.
+							<text style="font-size: 20rpx;">22</text>
+						</view>
+					</view>
+
+					<view class="commodity-3">
+						<view class="specifications">
+							【醇香】250ml*3
+						</view>
+						<view style="font-size: 24rpx;">
+							x1
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="btn-list">
+			<button v-if="status == 4">平台介入</button>
+			<button v-if="status == 3||status == 4">退款详情</button>
+			<button v-if="status == 6" @click="application">申请退款</button>
+		</view>
+		<view class="information">
+			<text class="_label">商品总价</text>
+			<view style="color: #222;">
+				<text style="font-size: 20rpx;">￥</text>
+				<text>133</text>.
+				<text style="font-size: 20rpx;">22</text>
+			</view>
+		</view>
+		<view class="information">
+			<text class="_label">商品总重量</text>
+			<view class="_title-right">
+				30Kg
+			</view>
+		</view>
+		<view class="information">
+			<text class="_label">跨境物流</text>
+			<view lass="_title-right">
+				海运散货 | 1号海运柜
+			</view>
+		</view>
+		<view class="information last">
+			<text class="_label">运费</text>
+			<view style="color: #222;">
+				<text style="font-size: 20rpx;">￥</text>
+				<text>133</text>.
+				<text style="font-size: 20rpx;">22</text>
+			</view>
+		</view>
+		<view class="_bottom">
+			<text class="_label">应付款 </text>
+			<view style="color: #f83224;margin-left: 10rpx;">
+				<text style="font-size: 20rpx;">￥</text>
+				<text>133</text>.
+				<text style="font-size: 20rpx;">22</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import textRight from '../../accountSecurity/component/textRight.vue'
+	export default {
+		components: {
+			textRight
+		},
+		props:{
+			status:{
+				typeof:Number,
+				default:0
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		methods:{
+			application(){
+				uni.navigateTo({
+					url:"/pageC/applicationRefund/applicationRefund"
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.detail {
+		padding: 28rpx 20rpx;
+		background-color: #fff;
+		border-radius: 16rpx;
+		margin-top: 28rpx;
+
+		.title {
+			display: flex;
+			justify-content: space-between;
+
+			.title-left {
+				display: flex;
+				font-size: 32rpx;
+				align-items: center;
+
+				.header-img {
+					width: 36rpx;
+					height: 36rpx;
+					border-radius: 50%;
+					margin-right: 20rpx;
+				}
+
+				.right-325 {
+					width: 32rpx;
+					height: 32rpx;
+				}
+			}
+
+			.order-status {
+				color: #f83224;
+				font-size: 26rpx;
+			}
+		}
+
+		.commodity-information {
+			margin-top: 28rpx;
+
+			.commodity-1 {
+				display: flex;
+
+				.commodity-img {
+					width: 180rpx;
+					height: 180rpx;
+					margin-right: 20rpx;
+					border-radius: 10rpx;
+				}
+
+				.commodity-2 {
+					display: flex;
+					justify-content: space-between;
+
+					.commodity-title {
+						width: 328rpx;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+						margin-right: 38rpx;
+					}
+				}
+
+				.commodity-3 {
+					display: flex;
+					justify-content: space-between;
+					margin-top: 20rpx;
+					color: #777;
+
+					.specifications {
+						font-size: 28rpx;
+						color: #777;
+					}
+				}
+			}
+		}
+		.last{
+			border-bottom: 2rpx solid rgba(151, 151, 151, .1);
+			padding-bottom: 20rpx;
+		}
+		.btn-list{
+			display: flex;
+			justify-content: flex-end;
+			button{
+				width: 152rpx;
+				height: 58rpx;
+				border: 2rpx solid #979797;
+				color: #444;
+				margin: 0;
+				padding: 0;
+				font-size: 24rpx;
+				background-color: #fff;
+				border-radius: 34rpx;
+				margin-top: 20rpx;
+				margin-left: 20rpx;
+			}
+		}
+		.information {
+			display: flex;
+			justify-content: space-between;
+			font-size: 28rpx;
+			align-items: flex-end;
+			margin: 34rpx 0;
+			._label{
+				font-size: 28rpx;
+				color: #333;
+			}
+			._title-right{
+				font-size: 28rpx;
+				color: #333;
+			}
+		}
+		._bottom{
+				display: flex;
+				justify-content: flex-end;
+				font-size: 28rpx;
+				align-items: flex-end;
+				margin-top: 34rpx;
+		}
+
+	}
+</style>

pageC/orderFormDetail/orderFormDetail.vue

@@ -0,0 +1,271 @@
+<template>
+	<view class="page" @click="closeShow">
+		<!-- 订单状态 -->
+		<view class="title">
+			<view v-if="status == 1">
+				<view class="payment">
+					等待付款
+				</view>
+				<text class="timer">剩22小时52分自动关闭</text>
+			</view>
+			<view class="payment" v-else-if="status == 2">
+				超时未付款，订单已取消
+			</view>
+			<view class="payment" v-else-if="status == 3">
+				未发货，退款成功
+			</view>
+			<view class="payment" v-else-if="status == 4">
+				未发货，退款中
+			</view>
+			<view class="payment" v-else-if="status == 5">
+				拼团中
+			</view>
+			<view class="payment" v-else-if="status == 6">
+				已付款，等待发货
+			</view>
+			<view class="payment" v-else-if="status == 7">
+				已发货，等待收货
+			</view>
+			<view class="payment" v-else-if="status == 8">
+				订单已完成，交易成功
+			</view>
+		</view>
+		<!-- 订单状态 -->
+
+		<!-- 地址信息 -->
+		<view class="address">
+			<view class="name-phone">
+				<u-icon name="map" size="22"></u-icon>
+				<view style="margin: 0 20rpx;font-size: 32rpx;">陈曦</view>
+				<text class="phone">17800000000</text>
+			</view>
+			<view class="address-detail">
+				江苏省淮安市清江浦区北京南路99号（青浦大桥南侧200
+				米）淮安恒大名都3号楼一单元1602
+			</view>
+		</view>
+
+		<commodityDetailVue :status="status" />
+
+		<view class="order">
+
+			<view class="order-number">
+				<text>
+					订单编号
+				</text>
+				<view>
+					8998391920137645 | <text decode @click="cope('111')">{{"&nbsp;"+"复制"}}</text>
+				</view>
+			</view>
+			<view class="order-number"
+				v-if="status == 3||status == 4||status == 5||status == 6||status == 7||status == 8">
+				<text>
+					支付方式
+				</text>
+				<view>
+					微信支付
+				</view>
+			</view>
+			<view class="order-number"
+				v-if="status == 3||status == 4||status == 5||status == 6||status == 7||status == 8">
+				<text>
+					支付时间
+				</text>
+				<view>
+					2023-12-08 22:40:03
+				</view>
+			</view>
+			<view class="order-number">
+				<text>
+					下单时间
+				</text>
+				<view>
+					2023-12-08 22:40:03
+				</view>
+			</view>
+		</view>
+		<view class="contact" v-if="status == 1||status == 6">
+			联系团长
+		</view>
+		<view class="footer" v-if="status != 6">
+			<button class="status-1" v-if="status == 1||status == 5">取消订单</button>
+			<button class="status-2" v-if="status == 1">继续付款</button>
+			<button class="status-1" v-if="status == 2||status == 3||status == 4">删除订单</button>
+			<button class="status-2" v-if="status == 2||status == 3||status == 4">再次购买</button>
+			<button class="status-1" v-if="status == 7">查看物流</button>
+			<button class="status-2" v-if="status == 7">确认收货</button>
+			<view style="margin-right: 40rpx; color: #777;font-size: 28rpx;" v-if="status == 8" @click="more">更多</view>
+			<button class="status-1" v-if="status == 8">查看物流</button>
+			<button class="status-1" v-if="status == 8">再来一单</button>
+			<button class="status-2" v-if="status == 8">评价</button>
+		</view>
+
+		<u-transition :show="show">
+			<view class="transition">删除订单</view>
+		</u-transition>
+	</view>
+</template>
+
+<script>
+	import commodityDetailVue from './component/commodityDetail.vue'
+	export default {
+		components: {
+			commodityDetailVue
+		},
+		data() {
+			return {
+				status: 6,
+				show: false
+			}
+		},
+		methods: {
+			//复制
+			cope(e) {
+				uni.setClipboardData({
+					data: e,
+					success() {
+						uni.showToast({
+							title: "复制成功",
+							icon: "none"
+						})
+					}
+				})
+			},
+			more() {
+				this.show = true
+			},
+			closeShow(e){
+				if(e._relatedInfo.anchorTargetText != "更多" && e._relatedInfo.anchorTargetText != "删除订单"){
+					this.show = false
+				}
+			}
+		},
+		created() {},
+		onLoad() {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.page {
+		padding: 20rpx 24rpx 180rpx;
+
+		.title {
+			.payment {
+				font-size: 44rpx;
+				font-weight: 600;
+				margin-bottom: 20rpx;
+			}
+
+			.timer {
+				font-size: 28rpx;
+				color: #666;
+			}
+		}
+
+		.address {
+			background-color: #fff;
+			border-radius: 16rpx;
+			padding: 34rpx 24rpx 28rpx;
+			margin-top: 24rpx;
+
+			.name-phone {
+				display: flex;
+				align-items: center;
+				align-items: flex-end;
+
+				.phone {
+					font-size: 26rpx;
+					color: #666;
+				}
+			}
+
+			.address-detail {
+				margin-top: 20rpx;
+				font-size: 24rpx;
+				color: #444;
+				margin-left: 60rpx;
+			}
+		}
+
+		.order {
+			background-color: #fff;
+			border-radius: 16rpx;
+			color: rgba(54, 54, 54, .7);
+			font-size: 28rpx;
+			margin-top: 20rpx;
+			padding: 20rpx 20rpx;
+
+			.order-number {
+				display: flex;
+				justify-content: space-between;
+				margin-bottom: 32rpx;
+			}
+		}
+
+		.contact {
+			padding: 20rpx 0;
+			background-color: #fff;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 16rpx;
+			margin-top: 20rpx;
+			margin-bottom: 160rpx;
+		}
+
+		.footer {
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			background-color: #fff;
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+			padding-top: 20rpx;
+			padding-bottom: 80rpx;
+			height: 66rpx;
+			width: 100%;
+
+			.status-1 {
+				background-color: #fff;
+				border-radius: 34rpx;
+				margin: 0;
+				padding: 0;
+				font-size: 28rpx;
+				color: #222;
+				width: 168rpx;
+				height: 68rpx;
+				margin-right: 20rpx;
+				border: 2rpx solid #979797;
+			}
+
+			.status-2 {
+				background-color: #ffffff;
+				border-radius: 34rpx;
+				margin: 0;
+				padding: 0;
+				font-size: 28rpx;
+				color: #f83224;
+				width: 168rpx;
+				height: 68rpx;
+				border: 2rpx solid #f83224;
+				margin-right: 24rpx;
+			}
+		}
+
+		.transition {
+			width: 164rpx;
+			height: 88rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 0rpx 20rpx -6rpx rgba(0, 0, 0, 0.3);
+			position: fixed;
+			bottom: 160rpx;
+			text-align: center;
+			line-height: 88rpx;
+			font-size: 26rpx;
+			color: #222;
+		}
+	}
+</style>

pageC/privacyPolicy/privacyPolicy.vue

@@ -0,0 +1,32 @@
+<template>
+	<view>
+		隐私政策
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		computed:{
+			i18n(){
+				return this.$t("index")
+			}
+		},
+		methods: {
+			
+		},
+		mounted() {
+			uni.setNavigationBarTitle({
+				title:this.i18n.privacy
+			})
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages.json

@@ -288,6 +288,7 @@
 				},
 				{
 					"path": "accountBalance/accountBalance",
+						"enablePullDownRefresh": false,
 					"style": {
 						"navigationBarTitleText": "账户余额",
 						"backgroundColor": "#f4f4f4",
@@ -297,9 +298,12 @@
 					}
 				},
 				{
-					"path": "balanceDetail/balanceDetail",
-					"style": {
-						"navigationBarTitleText": "余额明细",
+					"path" : "balanceDetail/balanceDetail",
+						"enablePullDownRefresh": false,
+					"style" : 
+					{
+						"navigationBarTitleText" : "余额明细",
+
 						"backgroundColor": "#ffffff",
 						"app-plus": {
 							"background": "#ffffff"
@@ -307,76 +311,102 @@
 					}
 				},
 				{
-					"path": "recharge/recharge",
-					"style": {
-						"navigationBarTitleText": "充值"
+					"path" : "recharge/recharge",
+						"enablePullDownRefresh": false,
+					"style" : 
+					{
+						"navigationBarTitleText" : "充值"
 					}
 				},
 				{
-					"path": "withdrawal/withdrawal",
-					"style": {
-						"navigationBarTitleText": "余额提现"
+					"path" : "withdrawal/withdrawal",
+						"enablePullDownRefresh": false,
+					"style" : 
+					{
+						"navigationBarTitleText" : "余额提现"
 					}
 				},
 				{
-					"path": "withdrawalDetail/withdrawalDetail",
-					"style": {
-						"navigationBarTitleText": "提现明细",
+					"path" : "withdrawalDetail/withdrawalDetail",
+						"enablePullDownRefresh": false,
+					"style" : 
+					{
+						"navigationBarTitleText" : "提现明细",
+						"enablePullDownRefresh": false,
 						"backgroundColor": "#ffffff"
 					}
 				},
 				{
-					"path": "ensureMoney/ensureMoney",
-					"style": {
-						"navigationBarTitleText": "保证金余额"
+					"path" : "ensureMoney/ensureMoney",
+						"enablePullDownRefresh": false,
+					"style" : 
+					{
+						"navigationBarTitleText" : "保证金余额"
 					}
 				},
 				{
-					"path": "ensureExplain/ensureExplain",
-					"style": {
-						"navigationBarTitleText": "保证金说明"
+					"path" : "ensureExplain/ensureExplain",
+						"enablePullDownRefresh": false,
+					"style" : 
+					{
+						"navigationBarTitleText" : "保证金说明"
 					}
 				},
 				{
-					"path": "mineFollow/mineFollow",
-					"style": {
-						"navigationBarTitleText": "",
+					"path" : "mineFollow/mineFollow",
+						"enablePullDownRefresh": false,
+					"style" : 
+					{
+						"navigationBarTitleText" : "",
+
 						"navigationStyle": "custom"
 					}
 
 				},
 				{
-					"path": "accountSetup/accountSetup",
-					"style": {
-						"navigationBarTitleText": "账号设置"
+					"path" : "accountSetup/accountSetup",
+						"enablePullDownRefresh": false,
+					"style" : 
+					{
+						"navigationBarTitleText" : "账号设置"
 					}
 				},
 				{
-					"path": "switchLanguage/switchLanguage",
-					"style": {
-						"navigationBarTitleText": "切换语言"
+					"path" : "switchLanguage/switchLanguage",
+						"enablePullDownRefresh": false,
+					"style" : 
+					{
+						"navigationBarTitleText" : "切换语言"
 					}
 				},
 				{
-					"path": "personalInformation/personalInformation",
-					"style": {
-						"navigationBarTitleText": "个人信息"
+					"path" : "personalInformation/personalInformation",
+						"enablePullDownRefresh": false,
+					"style" : 
+					{
+						"navigationBarTitleText" : "个人信息"
 					}
 				},
 				{
-					"path": "editName/editName",
-					"style": {
-						"navigationBarTitleText": ""
+					"path" : "editName/editName",
+						"enablePullDownRefresh": false,
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
 					}
 				},
 				{
-					"path": "addressManagement/addressManagement",
-					"style": {
-						"navigationBarTitleText": ""
+					"path" : "addressManagement/addressManagement",
+						"enablePullDownRefresh": false,
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+
 					}
 				},
 				{
 					"path" : "addEditAddress/addEditAddress",
+						"enablePullDownRefresh": false,
 					"style" : 
 					{
 						"navigationBarTitleText" : ""
@@ -384,13 +414,63 @@
 				},
 				{
 					"path" : "orderForm/orderForm",
+						"enablePullDownRefresh": false,
 					"style" : 
 					{
-						"navigationBarTitleText" : ""
+						"navigationBarTitleText" : "",
+						"navigationStyle": "custom"
 					}
 				},
 				{
 					"path" : "internationalAddress/internationalAddress",
+						"enablePullDownRefresh": false,
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
+				},
+				{
+					"path" : "accountSecurity/accountSecurity",
+						"enablePullDownRefresh": false,
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
+				},
+				{
+					"path" : "accountCancellation/accountCancellation",
+						"enablePullDownRefresh": false,
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
+				},
+				{
+					"path" : "privacyPolicy/privacyPolicy",
+						"enablePullDownRefresh": false,
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
+				},
+				{
+					"path" : "orderFormDetail/orderFormDetail",
+						"enablePullDownRefresh": false,
+					"style" : 
+					{
+						"navigationBarTitleText" : "",
+						"navigationBarBackgroundColor": "#f4f4f4"
+					}
+				},
+				{
+					"path" : "myPackage/myPackage",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
+				},
+				{
+					"path" : "applicationRefund/applicationRefund",
 					"style" : 
 					{
 						"navigationBarTitleText" : ""

pages/mine/component/mallOrderForm.vue

@@ -1,37 +1,54 @@
 <template>
 	<!-- 商城订单 -->
 	<view class="mall">
-		<view class="mall-top"> <text class="mall-title">商城订单</text>
-			<view class="all"> <text>全部</text>
+		<view class="mall-top"> <text class="mall-title">{{i18n.mallOrders}}</text>
+			<view class="all" @click="toOrderFrom"> <text>{{i18n.whole}}</text>
 				<image class="right" src='../../../static/mine/right.png' mode=""></image>
 			</view>
 		</view>
 		<view class="order-form">
 			<view class="icon-center">
 				<image class="form-icon" src='../../../static/mine/310.png' mode=""></image>
-				<view class="characters">待付款</view>
+				<view class="characters">{{i18n.pendingPayment}}</view>
 			</view>
 			<view class="icon-center">
 				<image class="form-icon" src='../../../static/mine/311.png' mode=""></image>
-				<view class="characters">拼团中</view>
+				<view class="characters">{{i18n.joiningGroups}}</view>
 			</view>
 			<view class="icon-center">
 				<image class="form-icon" src='../../../static/mine/312.png' mode=""></image>
-				<view class="characters">代发货</view>
+				<view class="characters">{{i18n.toBeShipped}}</view>
 			</view>
 			<view class="icon-center">
 				<image class="form-icon" src='../../../static/mine/313.png' mode=""></image>
-				<view class="characters">待收货</view>
+				<view class="characters">{{i18n.toBeReceived}}</view>
 			</view>
 			<view class="icon-center">
 				<image class="form-icon" src='../../../static/mine/314.png' mode=""></image>
-				<view class="characters">退款/售后</view>
+				<view class="characters">{{i18n.refund}}</view>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	export default {
+		data(){
+			return {}
+		},
+		computed:{
+			i18n(){
+				return this.$t('index')
+			}
+		},
+		methods:{
+			toOrderFrom(){
+				uni.navigateTo({
+					url:"/pageC/orderForm/orderForm"
+				})
+			}
+		}
+	}
 </script>
 
 <style lang="scss">

pages/mine/component/mineMoney.vue

@@ -4,22 +4,22 @@
 		<view class="top" v-if="isTeam" @click="toEnsure">
 			<view class="content">
 				<image class="money-icon" src='../../../static/mine/308.png' mode=""></image>
-				<text>我的保证金</text>
+				<text>{{i18n.myDeposit}}</text>
 			</view>
 			<view class="content">200.00 <text class="right-icon"></text> </view>
 		</view>
 		<view class="bottom">
 			<view class="basis" @click="jumpBalance">
 				<view class="num">0.00</view>
-				<view class="characters">余额</view>
+				<view class="characters">{{i18n.balance}}</view>
 			</view>
 			<view class="basis" @click="toFollow">
 				<view class="num">225</view>
-				<view class="characters">我的关注</view>
+				<view class="characters">{{i18n.mineFollow}}</view>
 			</view>
-			<view class="basis" @click="aaa">
+			<view class="basis" @click="toPackage">
 				<view class="num">13</view>
-				<view class="characters">我的包裹</view>
+				<view class="characters">{{i18n.myPackage}}</view>
 			</view>
 		</view>
 	</view>
@@ -37,6 +37,11 @@
 			return{
 			}
 		},
+		computed:{
+			i18n(){
+				return this.$t('index')
+			}
+		},
 		methods:{
 			jumpBalance(){
 				uni.navigateTo({
@@ -53,9 +58,9 @@
 					url:'/pageC/mineFollow/mineFollow'
 				})
 			},
-			aaa(){
+			toPackage(){
 				uni.navigateTo({
-					url:"/pageC/orderForm/orderForm"
+					url:"/pageC/myPackage/myPackage"
 				})
 			}
 		},

pages/mine/component/teamFunction.vue

@@ -1,39 +1,39 @@
 <template>
 	<!-- 团长功能 -->
 	<view class="team">
-		<text class="team-title">团长功能</text>
+		<text class="team-title">{{i18n.leaderunction}}</text>
 		<view class="function-team">
 			<view class="icon-center">
 				<image class="form-icon" src="../../../static/mine/319.png" mode=""></image>
-				<view class="characters">平台商品库</view>
+				<view class="characters">{{i18n.platform}}</view>
 			</view>
 			<view class="icon-center">
 				<image class="form-icon" src='../../../static/mine/318.png' mode=""></image>
-				<view class="characters">商品管理</view>
+				<view class="characters">{{i18n.productManagement}}</view>
 			</view>
 			<view class="icon-center">
 				<image class="form-icon" src="../../../static/mine/315.png" mode=""></image>
-				<view class="characters">订单管理</view>
+				<view class="characters">{{i18n.orderManagement}}</view>
 			</view>
 			<view class="icon-center">
 				<image class="form-icon" src="../../../static/mine/320.png" mode=""></image>
-				<view class="characters">售后管理</view>
+				<view class="characters">{{i18n.afterSales}}</view>
 			</view>
 			<view class="icon-center">
 				<image class="form-icon" src="../../../static/mine/316.png" mode=""></image>
-				<view class="characters">供应链商品</view>
+				<view class="characters">{{i18n.supplyChain}}</view>
 			</view>
 			<view class="icon-center">
 				<image class="form-icon" style="padding: 0 15px;" src="../../../static/mine/pc.png" mode=""></image>
-				<view class="characters">PC端</view>
+				<view class="characters">{{i18n.PCEnd}}</view>
 			</view>
 			<view class="icon-center">
 				<image class="form-icon" src="../../../static/mine/317.png" mode=""></image>
-				<view class="characters">联系客服</view>
+				<view class="characters">{{i18n.pontact}}</view>
 			</view>
 			<view class="icon-center">
 				<image class="form-icon" src="../../../static/mine/321.png" mode="" @click="toSetup"></image>
-				<view class="characters">账号设置</view>
+				<view class="characters">{{i18n.accountSettings}}</view>
 			</view>
 		</view>
 	</view>
@@ -46,6 +46,11 @@
 				
 			}
 		},
+		computed:{
+			i18n(){
+				return this.$t("index")
+			},
+		},
 		methods:{
 			toSetup(){
 				uni.navigateTo({
@@ -58,12 +63,12 @@
 
 <style lang="scss">
 	.team{
-		height: 170px;
 		width: 100%;
 		background-color: #fff;
 		border-radius: 10px;
 		margin-top: 10px;
 		padding-top: 14px;
+		padding-bottom: 20px;
 		.team-title{
 			color: #222;
 			font-size: 14px;

unpackage/dist/dev/mp-weixin/app.json

@@ -66,7 +66,13 @@
         "addressManagement/addressManagement",
         "addEditAddress/addEditAddress",
         "orderForm/orderForm",
-        "internationalAddress/internationalAddress"
+        "internationalAddress/internationalAddress",
+        "accountSecurity/accountSecurity",
+        "accountCancellation/accountCancellation",
+        "privacyPolicy/privacyPolicy",
+        "orderFormDetail/orderFormDetail",
+        "myPackage/myPackage",
+        "applicationRefund/applicationRefund"
       ]
     },
     {

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -5066,13 +5066,16 @@ module.exports = _setPrototypeOf, module.exports.__esModule = true, module.expor
 "use strict";
 
 
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
+var _index, _index2;
 var _default = {
   "zh-CN": {
-    index: {
+    index: (_index = {
       homepage: '主页',
       switchLanguage: '切换语言',
       address: '地址管理',
@@ -5114,12 +5117,34 @@ var _default = {
       empty: "清空",
       country: "国家",
       postalCode: "邮编",
-      email: "电子邮箱"
-    }
+      email: "电子邮箱",
+      companyName: "公司名称",
+      selection: "请选择",
+      PleacePostalCode: "请输入邮编",
+      addressBook: "保存到地址薄",
+      pleaseEmail: "请输入电子邮箱（选填）",
+      editPassword: "修改登录密码",
+      editPhone: "修改手机号",
+      accountCancellation: "账号注销",
+      setPassword: "设置密码",
+      cancellation: "注销后无法恢复，请谨慎操作",
+      myDeposit: "我的保证金",
+      balance: "余额",
+      mineFollow: "我的关注",
+      myPackage: "我的包裹",
+      mallOrders: "商城订单",
+      whole: "全部",
+      pendingPayment: "待付款",
+      joiningGroups: "拼团中",
+      toBeShipped: "待发货",
+      toBeReceived: "待收货",
+      refund: "退款/售后",
+      leaderunction: "团长功能"
+    }, (0, _defineProperty2.default)(_index, "platform", "平台商品库"), (0, _defineProperty2.default)(_index, "productManagement", "商品管理"), (0, _defineProperty2.default)(_index, "orderManagement", "订单管理"), (0, _defineProperty2.default)(_index, "afterSales", "售后管理"), (0, _defineProperty2.default)(_index, "supplyChain", "供应链商品"), (0, _defineProperty2.default)(_index, "PCEnd", "PC端"), (0, _defineProperty2.default)(_index, "pontact", "联系客服"), (0, _defineProperty2.default)(_index, "accountSettings", "账号设置"), _index)
   },
   "en-US": {
-    index: {
-      homepage: 'homepage',
+    index: (_index2 = {
+      homepage: 'Homepage',
       switchLanguage: "Switch Language",
       address: "Address Management",
       addAndEdit: "add/modify Address",
@@ -5160,8 +5185,30 @@ var _default = {
       empty: "Empty",
       country: "Country",
       postalCode: "Postal code",
-      email: "E-mail"
-    }
+      email: "E-mail",
+      companyName: "Company Name",
+      selection: "Please Select",
+      PleacePostalCode: "Please enter your postal code",
+      addressBook: "Save to Address Book",
+      pleaseEmail: "Please enter your email address (optional)",
+      cancellation: "Unable to recover after logging out, please operate with caution",
+      editPassword: "Change login password",
+      editPhone: "Change phone number",
+      accountCancellation: "Account Cancellation",
+      setPassword: "Set password",
+      myDeposit: "My deposit",
+      balance: "Balance",
+      mineFollow: "My following",
+      myPackage: "My Package",
+      mallOrders: "Mall orders",
+      whole: "Whole",
+      pendingPayment: "Pending payment",
+      joiningGroups: "Joining groups",
+      toBeShipped: "To be shipped",
+      toBeReceived: "To be received",
+      refund: "Refund/After sales",
+      leaderunction: "Leader function"
+    }, (0, _defineProperty2.default)(_index2, "platform", "Platform product library"), (0, _defineProperty2.default)(_index2, "productManagement", "Product Management"), (0, _defineProperty2.default)(_index2, "orderManagement", "order management"), (0, _defineProperty2.default)(_index2, "afterSales", "After sales"), (0, _defineProperty2.default)(_index2, "supplyChain", "Supply chain goods"), (0, _defineProperty2.default)(_index2, "PCEnd", "PC end"), (0, _defineProperty2.default)(_index2, "pontact", "Contact customer service"), (0, _defineProperty2.default)(_index2, "accountSettings", "Account Settings"), _index2)
   }
 };
 exports.default = _default;

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -101,6 +101,7 @@ var components
 try {
   components = {
     uNavbar: function () {
+<<<<<<< HEAD
       return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 571))
     },
     uSubsection: function () {
@@ -120,6 +121,27 @@ try {
     },
     kjTabbar: function () {
       return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 620))
+=======
+      return Promise.all(/*! import() | uview-ui/components/u-navbar/u-navbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-navbar/u-navbar")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-navbar/u-navbar.vue */ 567))
+    },
+    uSubsection: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-subsection/u-subsection */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-subsection/u-subsection")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 575))
+    },
+    uIcon: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 583))
+    },
+    uTabs: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs/u-tabs.vue */ 592))
+    },
+    uSwiper: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-swiper/u-swiper */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-swiper/u-swiper")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-swiper/u-swiper.vue */ 600))
+    },
+    uPopup: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 608))
+    },
+    kjTabbar: function () {
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 616))
+>>>>>>> 237bb070b3d2cda196dfde8582f16483bcdcb81c
     },
   }
 } catch (e) {
@@ -361,6 +383,7 @@ exports.default = void 0;
 //
 //
 //
+//
 var _default = {
   data: function data() {
     return {

unpackage/dist/dev/mp-weixin/pages/mine/mine.js

@@ -101,7 +101,11 @@ var components
 try {
   components = {
     kjTabbar: function () {
+<<<<<<< HEAD
       return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 620))
+=======
+      return Promise.all(/*! import() | components/kj-tabbar/kj-tabbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/kj-tabbar/kj-tabbar")]).then(__webpack_require__.bind(null, /*! @/components/kj-tabbar/kj-tabbar.vue */ 616))
+>>>>>>> 237bb070b3d2cda196dfde8582f16483bcdcb81c
     },
   }
 } catch (e) {
@@ -166,22 +170,38 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var MineMoney = function MineMoney() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/mineMoney */ "pages/mine/component/mineMoney").then((function () {
+<<<<<<< HEAD
     return resolve(__webpack_require__(/*! ./component/mineMoney.vue */ 626));
+=======
+    return resolve(__webpack_require__(/*! ./component/mineMoney.vue */ 622));
+>>>>>>> 237bb070b3d2cda196dfde8582f16483bcdcb81c
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var MallOrderForm = function MallOrderForm() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/mallOrderForm */ "pages/mine/component/mallOrderForm").then((function () {
+<<<<<<< HEAD
     return resolve(__webpack_require__(/*! ./component/mallOrderForm.vue */ 633));
+=======
+    return resolve(__webpack_require__(/*! ./component/mallOrderForm.vue */ 629));
+>>>>>>> 237bb070b3d2cda196dfde8582f16483bcdcb81c
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var TeamFunction = function TeamFunction() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/teamFunction */ "pages/mine/component/teamFunction").then((function () {
+<<<<<<< HEAD
     return resolve(__webpack_require__(/*! ./component/teamFunction.vue */ 640));
+=======
+    return resolve(__webpack_require__(/*! ./component/teamFunction.vue */ 636));
+>>>>>>> 237bb070b3d2cda196dfde8582f16483bcdcb81c
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var PersonalFunction = function PersonalFunction() {
   __webpack_require__.e(/*! require.ensure | pages/mine/component/personalFunction */ "pages/mine/component/personalFunction").then((function () {
+<<<<<<< HEAD
     return resolve(__webpack_require__(/*! ./component/personalFunction.vue */ 647));
+=======
+    return resolve(__webpack_require__(/*! ./component/personalFunction.vue */ 643));
+>>>>>>> 237bb070b3d2cda196dfde8582f16483bcdcb81c
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

uview-ui/components/u-textarea/u-textarea.vue

@@ -201,11 +201,10 @@ export default {
 
 .u-textarea {
     border-radius: 4px;
-    background-color: #fff;
+    background-color: #f4f4f4;
     position: relative;
     @include flex;
     flex: 1;
-	padding: 9px;
 
     &--radius {
         border-radius: 4px;