Merge branch 'master' of http://git.aseanbusiness.cn/qzyReal/market-app-ui

App.vue

@@ -50,7 +50,7 @@ button::after {
 /**挂载iconfont字体图标*/
 @font-face {
 	font-family: 'iconfont';
-	src: url('https://at.alicdn.com/t/c/font_4191999_iwlclbsmm7.ttf?t=1691268694703') format('truetype');
+	src: url('https://at.alicdn.com/t/c/font_4191999_z2jzykzkv2.ttf?t=1691430428769') format('truetype');
 	/* src: url('~@/static/font/iconfont.ttf') format('truetype'); */
 }
 .icon {

common/style.scss

@@ -674,7 +674,7 @@
 			.an{
 				float: right;
 				margin-left: 15px;
-				margin-top: -17px;
+				margin-top: 4px;
 				font-weight: bold;
 			}
 			

pages.json

@@ -60,24 +60,6 @@
 			}
 
 		}, {
-			"path": "pages/oneMarket/oneMarket",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom",
-				"app-plus": {
-					"titleNView": {
-						"autoBackButton": false
-					}
-				}
-			}
-
-		}, {
-			"path": "pages/oneMarket/order/order",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		}, {
 			"path": "pages/goodsDetails/goodsDetails",
 			"style": {
 				"navigationBarTitleText": "",
@@ -135,13 +117,6 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
-			"path": "pages/oneMarket/cart/cart",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
 		},
 		{
 			"path": "pages/market/two/purchaser/buy/list",
@@ -176,7 +151,7 @@
 			"path": "pages/market/two/purchaser/address/list",
 			"style": {
 				"navigationBarTitleText": "选择地址",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"app-plus": {
 					"titleNView": {
 						"buttons": [{
@@ -223,6 +198,13 @@
 			}
 
 		}, {
+			"path": "pages/market/one/leader/success",
+			"style": {
+				"navigationBarTitleText": "接单成功",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
 			"path": "pages/market/two/leader/order",
 			"style": {
 				"navigationBarTitleText": "订单列表",

pages/market/one/leader/cart.vue

@@ -16,7 +16,7 @@
 				<view class="clear"></view>
 				<view class="op">
 					<view class="date">{{ item.createTime }}</view>
-					<view class="an btn" @click.stop="buy(item)">立即够买</view>
+					<view class="an btn" @click.stop="buy(item)">立即购买</view>
 				</view>
 			</view>
 			<u-empty v-if="list.length == 0"></u-empty>
@@ -51,9 +51,9 @@ export default {
 		buy(item) {
 			this.http.request({
 				url: '/level-one-server/app/TbGoodsTransit/purchaseLevelOntGoodsTransit',
-				data: { goodsTransitId: item.publishGoodsId },
+				data: { goodsTransitId: item.publishGoodsId, goodsCartId: item.id },
 				method: 'POST',
-				contentType: 'application/json; charset=utf-8',
+				contentType: 'application/json;charset=utf-8',
 				success: res => {
 					uni.redirectTo({ url: '/pages/market/one/leader/success' });
 				}

pages/market/one/leader/order.vue

@@ -20,7 +20,7 @@
 				</view>
 				<image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
 				<view class="con">
-					<view class="productName omit">越南巴沙鱼</view>
+					<view class="productName omit">{{item.goodsNames}}</view>
 					<view class="desc omit">
 						<text>50吨</text>
 						<text>{{ item.tradeAreaName }}</text>
@@ -47,12 +47,11 @@ export default {
 	data() {
 		return {
 			tab: [
-				{ name: '全部', enterpriseConfirm: '' },
-				{ name: '待确认', enterpriseConfirm: 0 },
-				{ name: '申报中', enterpriseConfirm: 1 },
-				{ name: '已完成', enterpriseConfirm: 2 },
-				{ name: '转售中', enterpriseConfirm: 2 },
-				{ name: '已取消', enterpriseConfirm: 2 }
+				{ name: '全部', enterpriseConfirm: '' ,apply: ''},
+				{ name: '待确认', enterpriseConfirm: 0 ,apply: 0},//enterpriseConfirm:商户确认(0=待确认,1=是,2=否)
+				{ name: '申报中', enterpriseConfirm: 1 ,apply: 0},
+				{ name: '已完成', enterpriseConfirm: 1 ,apply: 1},//apply:申报[0=待申报,1=申报通过,2=申报不通过]
+				{ name: '已取消', enterpriseConfirm: 2 ,apply: ''}
 			],
 			param: { pageNo: 1, pageSize: 10},
 			list: [],
@@ -79,6 +78,7 @@ export default {
 		//点击tab切换
 		click(e) {
 			this.param.enterpriseConfirm = e.enterpriseConfirm;
+			this.param.apply = e.apply
 			this.refresh();
 		},
 		detail(item) {

pages/market/one/list.vue

@@ -23,11 +23,11 @@
 				<view class="con">
 					<view class="productName omit">{{ item.goodsName }}</view>
 					<view class="desc">
-						<text>50吨</text>
+						<text>{{item.grossWeight}} {{item.goodsUnits}}</text>
 						<text>{{ item.tradeAreaName }}</text>
 					</view>
 					<view class="price">¥ {{ item.price }}</view>
-					<view class="icon buy" @click.stop="addCar(item)">&#xe604;</view>
+					<view class="icon buy" @click.stop="addCar(item)" v-if="user.userType == 2">&#xe604;</view>
 				</view>
 				<view class="clear"></view>
 			</view>

pages/market/one/merchant/goods/add.vue

@@ -16,55 +16,36 @@
 				</picker>
 				<input v-else placeholder="请选择" v-model="item.goodsName" :disabled="true" disabled="true"/>
 			</view>
-			<!-- <view class="form_group">
-				<view class="lable re">商品产地</view>
-				<input placeholder="请输入" v-model="item.placeOrigin" />
-			</view>
-			<view class="form_group">
-				<view class="lable re">商品类型</view>
-				<picker :range="dict.goodsType" @change="picker($event, 'goodsType')">
-					<input placeholder="请选择" v-model="item.goodsType" :disabled="true" />
-					<view class="icon more">&#xe8f2;</view>
-				</picker>
-			</view>
-			<view class="form_group">
-				<view class="lable re">商品单位</view>
-				<picker :range="dict.goodsUnits" @change="picker($event, 'goodsUnits')">
-					<input placeholder="请选择" v-model="item.goodsUnits" :disabled="true" />
-					<view class="icon more">&#xe8f2;</view>
-				</picker>
-			</view> -->
 			<view class="form_group">
 				<view class="lable re">商品价格</view>
 				<input type="number" placeholder="请输入" v-model="item.price" />
-				<view class="ops">元</view>
+				<view class="ops" v-if="flag === '编辑商品'">{{ item.goodsUnits }}</view>
+				<view class="ops" v-else>{{ item.unit }}</view>
 			</view>
 			<view class="form_group">
 				<view class="lable re">商品数量</view>
 				<input type="number" placeholder="请输入" v-model="item.stock" />
-				<view class="ops">{{ item.goodsUnits }}</view>
+				
 			</view>
 			<view class="form_group">
 				<view class="lable re">净重</view>
 				<input placeholder="请输入" v-model="item.netWeight" />
-				<view class="ops">吨</view>
+				<view class="ops" v-if="flag === '编辑商品'">{{ item.goodsUnits }}</view>
+				<view class="ops" v-else>{{ item.unit }}</view>
 			</view>
 			<view class="form_group">
 				<view class="lable re">毛重</view>
 				<input placeholder="请输入" v-model="item.grossWeight" />
-				<view class="ops">吨</view>
+				<view class="ops" v-if="flag === '编辑商品'">{{ item.goodsUnits }}</view>
+				<view class="ops" v-else>{{ item.unit }}</view>
 			</view>
 			<view class="form_group">
 				<view class="lable re">商品状态</view>
 				<picker :range="dict.goodsStatus" @change="picker($event, 'goodsStatus')">
-					<input placeholder="请选择" :value="item.goodsStatus == 1 ? '在售' : '下架'" :disabled="true" />
+					<input placeholder="请选择" :value="item.goodsStatus" :disabled="true" />
 					<view class="icon more">&#xe8f2;</view>
 				</picker>
 			</view>
-			<!-- <view class="form_group">
-				<view class="lable re">商品描述</view>
-				<textarea v-model="item.description" placeholder="请输入"></textarea>
-			</view> -->
 		</view>
 	</view>
 </template>
@@ -74,7 +55,7 @@ export default {
 	data() {
 		return {
 			flag: '新增商品',
-			item: {},
+			item: {tradeAreaName:''},
 			dict: {
 				goodsType: ['水果', '药品', '茶叶'],
 				goodsUnits: ['吨', '个', '柜'],
@@ -91,6 +72,7 @@ export default {
 				url: '/level-one-server/app/TbGoodsTransit/getById?id=' + e.id,
 				success: res => {
 					this.item = res.data.data;
+					this.item.goodsStatus = this.item.goodsStatus == 1 ? '在售' : '下架';
 					uni.setNavigationBarTitle({ title: '编辑商品' });
 				}
 			});
@@ -105,9 +87,11 @@ export default {
 		},
 		pickerGoods(e) {
 			this.item['goodsName'] = this.goodsList[e.detail.value].name;
+			this.item['unit'] = this.goodsList[e.detail.value].unit;
 			this.$forceUpdate();
 			if(this.flag == '新增商品') {
 				this.item.id = this.goodsList[e.detail.value].id;
+
 			}
 		},
 		pickerTradeArea(e) {
@@ -147,12 +131,16 @@ export default {
 			uni.showModal({ content: this.verify.error, showCancel: false });
 			return false;
 		}
+		this.item.goodsStatus = this.item.goodsStatus == '在售' ? 1 : 0;
 		let url = '';
 		if(this.flag == '新增商品') {
 			url = '/level-one-server/app/TbGoodsTransit/transactionGoods';
 		} else {
 			url = '/level-one-server/app/TbGoodsTransit/update';
 		}
+		delete this.item.createTime;
+		delete this.item.createBy;
+		delete this.item.createName;
 		this.http.request({
 			url: url,
 			method: 'POST',

pages/market/one/merchant/order/list.vue

@@ -47,12 +47,12 @@ export default {
 	data() {
 		return {
 			tab: [
-				{ name: '全部', enterpriseConfirm: '' },
-				{ name: '待确认', enterpriseConfirm: 0 },
-				{ name: '已确认', enterpriseConfirm: 1 },
-				{ name: '已拒绝', enterpriseConfirm: 2 }
+				{ name: '全部', enterpriseConfirm: '', isOrders: ''},
+				{ name: '待确认', enterpriseConfirm: 0, isOrders: 1},
+				{ name: '已确认', enterpriseConfirm: 1, isOrders: 1},
+				{ name: '已拒绝', enterpriseConfirm: 2 ,isOrders: 0}
 			],
-			param: { pageNo: 1, pageSize: 10, isOrders: 1 },
+			param: { pageNo: 1, pageSize: 10},
 			list: [],
 			loadMore: true
 		};
@@ -75,6 +75,7 @@ export default {
 		//点击tab切换
 		click(e) {
 			this.param.enterpriseConfirm = e.enterpriseConfirm;
+			this.param.isOrders = e.isOrders;
 			this.refresh();
 		},
 		detail(item) {
@@ -86,16 +87,17 @@ export default {
 			this.param.pageNo = 1;
 			this.list = [];
 			this.getData();
-		},
+		}, 
 		// 商家确认
 		confirm(id, status, content) {
+			//enterprise_confirm：'商铺确认情况[0=待确认,1=已确认,2=拒绝]'
 			uni.showModal({
 				title: '提示',
 				content: content,
 				success: res => {
 					if (res.confirm) {
 						this.http.request({
-							url: '/level-one-server/app/TbGoodsTransit/update',
+							url: '/level-one-server/app/TbGoodsTransit/updateEnterpriseConfirm',
 							data: { id: id, enterpriseConfirm: status },
 							method: 'POST',
 							success: resp => {

pages/market/two/list.vue

@@ -39,26 +39,7 @@ export default {
 		return {
 			user: this.getUser(),
 			show: false,
-			sort: [
-				{
-					name: '综合',
-					key: 1,
-					isAsc: 'desc',
-					check: false
-				},
-				{
-					name: '日期',
-					key: 2,
-					isAsc: 'desc',
-					check: false
-				},
-				{
-					name: '价格',
-					key: 3,
-					isAsc: 'desc',
-					check: false
-				}
-			],
+			sort: [{ name: '综合' }, { name: '日期' }, { name: '价格' }],
 			list: [{}, {}, {}, {}],
 			param: { pageNo: 1, pageSize: 10 },
 			loadMore: true

pages/market/two/purchaser/address/add.vue

@@ -3,15 +3,19 @@
 		<view class="forms">
 			<view class="form_group pt0">
 				<view class="lable re">收件人</view>
-				<input placeholder="请输入" v-model="item.typeCode" />
+				<input placeholder="请输入" v-model="item.name" />
 			</view>
 			<view class="form_group">
 				<view class="lable re">联系电话</view>
-				<input placeholder="请输入" v-model="item.typeCode" />
+				<input type="number" placeholder="请输入" v-model="item.phone" />
+			</view>
+			<view class="form_group">
+				<view class="lable re">省市区</view>
+				<uni-data-picker :localdata="cityData" v-model="item.area" :map="{ text: 'name', value: 'name' }" popup-title="选择省市区" @change="change"></uni-data-picker>
 			</view>
 			<view class="form_group">
 				<view class="lable re">详细地址</view>
-				<textarea v-model="item.remarks" placeholder="请输入"></textarea>
+				<textarea v-model="item.street" placeholder="请输入"></textarea>
 			</view>
 		</view>
 		<view class="mfooter">
@@ -28,36 +32,47 @@
 </template>
 
 <script>
+import city from '../../../../../common/data.js';
 export default {
 	data() {
 		return {
+			cityData: city.data.data,
 			item: {}
 		};
 	},
 	onLoad(e) {
 		if (e.id) {
 			this.http.request({
-				url: '/level-one-server/app/TbPortNews/getPortNewsDetails',
-				data: { id: e.id },
+				url: '/level-two-server/app/address/getById/' + e.id,
 				success: res => {
 					this.item = res.data.data;
+					uni.setNavigationBarTitle({ title: '编辑地址' });
 				}
 			});
 		}
 	},
 	methods: {
+		change(e) {
+			if (e.detail.value.length > 0) {
+				this.item.province = e.detail.value[0].value; //省
+				this.item.city = e.detail.value[1].value; //市
+				this.item.area = e.detail.value[e.detail.value.length - 1].value; //区
+			}
+			this.$forceUpdate();
+		},
 		save() {
 			let rule = [
-				{ name: 'typeCode', checkType: 'notnull', errorMsg: '请输入编码' },
-				{ name: 'typeName', checkType: 'notnull', errorMsg: '请输入名称' },
-				{ name: 'status', checkType: 'notnull', errorMsg: '请选择状态' }
+				{ name: 'name', checkType: 'notnull', errorMsg: '请输入收件人姓名' },
+				{ name: 'phone', checkType: 'notnull', errorMsg: '请输入联系电话' },
+				{ name: 'area', checkType: 'notnull', errorMsg: '请选择省市区' },
+				{ name: 'street', checkType: 'notnull', errorMsg: '请输入详细地址' }
 			];
 			if (!this.verify.check(this.item, rule)) {
 				uni.showModal({ content: this.verify.error, showCancel: false });
 				return false;
 			}
 			this.http.request({
-				url: '/project/projectType',
+				url: '/level-two-server/app/address/saveOrUpdate',
 				method: 'POST',
 				data: this.item,
 				success: res => {
@@ -72,13 +87,11 @@ export default {
 		del(id) {
 			uni.showModal({
 				title: '提示',
-				content: '确定删除该数据?',
+				content: '确定删除该地址?',
 				success: res => {
 					if (res.confirm) {
 						this.http.request({
-							url: '/customer/customerType',
-							data: { id: this.item.id },
-							method: 'POST',
+							url: '/level-two-server/app/address/delete/' + this.item.id,
 							success: res => {
 								uni.showToast({ title: '删除成功' });
 								setTimeout(() => {
@@ -95,4 +108,9 @@ export default {
 };
 </script>
 
-<style lang="scss"></style>
+<style lang="scss">
+.btn {
+	border-radius: 5px;
+	width: 100%;
+}
+</style>

pages/market/two/purchaser/address/list.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="list">
-		<view class="item" v-for="(item, index) in list" :key="index" @click="select(item)">
+		<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
 			<view class="address">
 				<view class="con">
-					<view class="title omit">云南省普洱市思茅区普洱路云南省普洱市思茅区普洱路36号云南省普洱市思茅区普洱路云南省普洱市思茅区普洱路</view>
+					<view class="title omit">{{item.province}} {{item.city}} {{item.area}} {{item.street}}</view>
 					<view class="desc">
 						<text>陈晓东</text>
 						<text>13481076556</text>
@@ -13,6 +13,8 @@
 				<view class="clear"></view>
 			</view>
 		</view>
+		<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
+		<u-empty v-if="!loadMore && list.length == 0"></u-empty>
 	</view>
 </template>
 
@@ -20,18 +22,23 @@
 export default {
 	data() {
 		return {
-			list: [{}, {}, {}, {}, {}],
+			select: false,
+			list: [],
 			param: { pageNo: 1, pageSize: 10 },
 			loadMore: true
 		};
 	},
 	onLoad(e) {
-		//this.getData();
+		this.select = e.select || false;
+		this.getData();
+		uni.$on('address', res => {
+			this.refresh();
+		});
 	},
 	methods: {
 		getData() {
 			this.http.request({
-				url: '/level-one-server/app/TbPortNews/getPortNewsList',
+				url: '/level-two-server/app/address/getList',
 				data: this.param,
 				loading: 'false',
 				success: res => {
@@ -40,9 +47,13 @@ export default {
 				}
 			});
 		},
-		select(item) {
-			uni.$emit('selectAddress', item);
-			uni.navigateBack();
+		detail(item) {
+			if (this.select) {
+				uni.$emit('selectAddress', item);
+				uni.navigateBack();
+			} else {
+				uni.navigateTo({ url: '/pages/market/two/purchaser/address/add?id=' + item.id });
+			}
 		},
 		//刷新数据
 		refresh() {

pages/market/two/purchaser/buy/add.vue

@@ -87,7 +87,7 @@ export default {
 	methods: {
 		//选择地址
 		address() {
-			uni.navigateTo({ url:'/pages/market/two/purchaser/address/list' });
+			uni.navigateTo({ url: '/pages/market/two/purchaser/address/list?select=true' });
 		},
 		picker(e, tag) {
 			if (tag == 'date') {

pages/market/two/purchaser/buy/list.vue

@@ -11,7 +11,6 @@
 					<view class="clear"></view>
 				</view>
 				<view class="con">
-					
 					<view class="flex fs">
 						<view class="f left" style="flex: 0.5">
 							<view class="tag">净重：50吨</view>

pages/oneMarket/cart/cart.vue

@@ -1,152 +0,0 @@
-<template>
-	<view>
-		<navigation-bar title="购物车" background-color="#0081ff" front-color="#ffffff" :left-button="null" />
-		<u-tabs lineWidth="50" :list="list" itemStyle="height:90rpx;width: 100rpx;" :is-scroll="false"
-			:current="current" @change="change"></u-tabs>
-		<u-list style="margin-top: 10rpx;padding: 15rpx;" @scrolltolower="scrolltolower">
-			<u-list-item v-for="(item, index) in cartList" :key="index">
-				<view class="item-box">
-					<view class="goods-item">
-						<view class="good-row">
-							<view>
-								<u--image radius="10" :showLoading="true" :src="item.goodsImg" width="250rpx"
-									height="210rpx"></u--image>
-							</view>
-							<view class="des">
-								<view style="font-size: 34rpx; height: 100rpx; display: flex;">
-									<view style="width: 300rpx;">
-										{{item.goodsName}}
-									</view>
-									<view class="status" @click="cleanCart(item.id)">
-										<uni-icons type="trash" color="grey" size="30"></uni-icons>
-									</view>
-								</view>
-								<!-- <view style="font-size: 34rpx;">[老板力荐]鲜活小龙虾(帮剪头去虾线)约250g/份</view> -->
-								<view class="subtit">
-									<view class="price">￥{{item.totalPrice}}</view>
-								</view>
-								
-							</view>
-						</view>
-					</view>
-					<view class="goods-item">
-						<view class="footer-item">
-							<view style="margin: 15rpx 0rpx;"><button size="mini"
-									:plain="true">立即购买</button></view>
-						</view>
-					</view>
-				</view>
-			</u-list-item>
-		</u-list>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				cartList: [],
-			}
-		},
-		onLoad() {
-			this.getCartList()
-		},
-		methods: {
-			getCartList() {
-				this.http.request({
-					url: '/level-one-server/TbGoodsCart/getList',
-					success: res => {
-						this.cartList = res.data.data;
-					}
-				});
-			},
-			scrolltolower() {
-				this.getCartList()
-			},
-			// 
-			cleanCart(id) {
-				this.http.request({
-					url: '/level-one-server/app/TbGoodsCart/cleanCart',
-					data: {id: 1460500735619366940},
-					contentType: 'application/json; charset=utf-8',
-					method: 'POST',
-					success: res => {
-						setTimeout(function() {
-							uni.showToast({
-								title: res.data.msg
-							});
-						}, 1000)
-					}
-				});
-				console.log( id + "类型"+ typeof id)
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.goods-item {
-		margin-bottom: 15rpx;
-	}
-
-	.good-row {
-		display: flex;
-		align-items: center;
-	}
-
-	.shop {
-		display: flex;
-		align-items: center;
-		width: 480rpx;
-	}
-
-	.shop-icon {
-		width: 60rpx;
-		height: 60rpx;
-		border-radius: 30rpx;
-		background-color: #eaf1fe;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.status {
-		width: 100rpx;
-		display: flex;
-		align-items: center;
-		// justify-content: flex-end;
-	}
-
-	.des {
-		margin-left: 20rpx;
-		position: relative;
-		top: 1rpx;
-		height: 200rpx;
-	}
-
-	.subtit {
-		font-size: 28rpx;
-		color: #9C9C9C;
-		margin: 20rpx 10rpx;
-	}
-
-	.footer-item {
-		display: flex;
-		justify-content: flex-end;
-		margin-top: -15rpx;
-		margin-bottom: 5rpx;
-	}
-
-	.price {
-		font-size: 30rpx;
-	}
-
-	.item-box {
-		height: 280rpx;
-		width: 85%;
-		padding: 30rpx;
-		border: 1rpx #888 solid;
-		margin: 10rpx 15rpx;
-		border-radius: 10rpx;
-	}
-</style>

pages/oneMarket/oneMarket.vue

@@ -1,324 +0,0 @@
-<template>
-	<view>
-	<!-- 			<image src="../../static/images/role/bm.png"></image> -->
-		<uni-nav-bar color="#fff" height="60" :fixed="true" left-icon="back" @clickLeft="back()" @clickRight="rightClick()"
-			right-icon="list" :border="false" backgroundColor="#0081ff" title="一级市场" />
-		</u-navbar>
-		<u-list class="list" width="100%" @scrolltolower="scrolltolower">
-			<u-list-item v-for="(item, index) in goods" :key="index">
-				<view class="item-box">
-					<view class="goods-item">
-						<u-row>
-							<u-col span="5" @click="toDetails(item.id)">
-								<u--image radius="10" :showLoading="true" src="" width="250rpx" height="220rpx"></u--image>
-							</u-col>
-							<u-col span="7">
-								<view class="t1 txt" @click="toDetails(item.id)">
-									<text>{{item.goodsName}}</text>
-									<!-- <text>[老板力荐]鲜活小龙虾(帮剪头去虾线)约250g/份</text> -->
-								</view>
-								<view class="txt">
-									<text v-if="item.grossWeight">{{item.grossWeight}}吨</text>
-								</view>
-								<view class="txt" v-if="item.tradeAreaName">
-									<u-tag style="width: 250rpx" :text="item.tradeAreaName" plain size="mini"></u-tag>
-								</view>
-								<view class="t4">
-									<view class="price">￥{{item.price}}</view>
-									<view class="car" @click="addCar(item)">
-										<uni-icons type="cart" color="#fff" size="30"></uni-icons>
-									</view>
-								</view>
-							</u-col>
-						</u-row>
-					</view>
-				</view>
-			</u-list-item>
-		</u-list>
-		<u-popup :show="show" mode="right" @close="close" @open="open">
-			<view class="pop" style="padding: 15px;">
-				<view class="item">
-					<view class="title">生鲜海鲜</view>
-					<view class="rows">
-						<view class="row omit" v-for="(item, index) in typeList" :key="index">
-							<view class="out">
-								<view class="int" @click="typeClick(item)" :style="{color: item.check?'#0081FF':'#213227'}">{{item.name}}</view>
-							</view>
-						</view>
-						<view class="clear"></view>
-					</view>
-				</view>
-				<u-button class="custom-style" shape="circle" type="primary" size="small" text="确定"
-					@click="close()"></u-button>
-			</view>
-		</u-popup>
-		<view class="tab">
-			<view class="tabBtn" @click="BtnClick(1)">
-				<u-icon label="购物车" size="30" color="#ef732a" labelColor="#ef732a" name="shopping-cart"></u-icon>
-			</view>
-			<view class="tabBtn" @click="BtnClick(2)">
-				<u-icon label="订单列表" size="30" color="#1E90FF" labelColor="#1E90FF" name="order"></u-icon>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				loadmoreStatus: 'loadmore',
-				goods: [],
-				active: 0,
-				title: '一级市场',
-				show: false,
-				typeList: [],
-				typeCheck: [],
-			}
-		},
-		onLoad() {
-			this.getGoodsList()
-		},
-		// onShow() {
-		// 	var a = document.getElementsByClassName('uni-page-head-hd')[0]
-		// 	a.style.display = 'none';
-		// },
-		methods: {
-			getGoodsList() {
-				this.http.request({
-					url: '/level-one-server/TbGoodsTransit/getTransitList',
-					success: res => {
-						this.goods = res.data.data;
-						// this.goods.forEach((item, index) => {
-						// 	if (index === this.goods.length - 1) {
-						// 		this.loadmoreStatus = 'nomore'
-						// 	} else {
-						// 		this.loadmoreStatus = 'loadmore'
-						// 	}
-						// })
-					}
-				});
-			},
-			// 添加购物车
-			addCar(goods) {
-				let user = uni.getStorageSync("info")
-				let params = {
-					buyUserId: user.id,
-					enterpriseId: goods.merchantId,
-					shopId: goods.shopId,
-					tradeAreaId: goods.tradeAreaId,
-					saleGoodsInfoId: goods.id,
-					goodsImg: goods.goodsImg,
-					goodsName: goods.goodsName,
-					publishGoodsId: goods.id
-					// buyNum: parseInt(this.num)
-				}
-				this.http.request({
-					url: '/level-one-server/app/TbGoodsCart/addGoodsInShopCart',
-					data: params,
-					contentType: 'application/json; charset=utf-8',
-					method: 'POST',
-					success: res => {
-						setTimeout(function() {
-							uni.showToast({
-								title: res.data.msg
-							});
-						}, 1000)
-					}
-				});
-			},
-			// 商品分类
-			getGoodsType() {
-				this.http.request({
-					url: '/level-one-server/TbGoodsType/getList',
-					success: res => {
-						this.typeList = res.data.data
-						this.typeList.map(item => {
-							item.check=false
-						})
-					}
-				});
-			},
-			scrolltolower() {
-				this.getGoodsList()
-			},
-			toDetails(id) {
-				this.$common.to('/pages/goodsDetails/goodsDetails?id=' + id)
-			},
-			back() {
-				uni.switchTab({
-					url: '/pages/index/index'
-				});
-			},
-			rightClick() {
-				this.show = true
-				this.getGoodsType()
-			},
-			open() {
-				// console.log('open');
-			},
-			close() {
-				this.typeList.map(item => {
-					if(item.check) this.typeCheck.push(item)
-				})
-				this.show = false
-			},
-			BtnClick(type) {
-				type == 1 ? uni.navigateTo({
-					url: '/pages/oneMarket/cart/cart'
-				}) : uni.navigateTo({
-					url: '/pages/oneMarket/order/order'
-				})
-			},
-			typeClick(data) {
-				this.typeList.map(item => {
-					if(item.no == data.no) item.check=!item.check
-				})
-				this.$forceUpdate();
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.item {
-		.title {
-			padding: 5px;
-		}
-
-		.rows {
-			width: 100%;
-
-			.row {
-				width: 33.33%;
-				float: left;
-				text-align: center;
-
-				.out {
-					padding: 6px;
-					overflow: hidden;
-
-					.int {
-						padding: 5px;
-						color: #213227;
-						background-color: #eaf1fe;
-						border-radius: 3px;
-						font-size: 14px;
-						overflow: hidden;
-
-						&.active {
-							color: $main-color;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	page {
-		background-image: url(../../static/images/top-bg.png);
-		background-size: 100% 400rpx;
-		background-repeat: no-repeat;
-		background-position: top;
-		background-color: #f3f4f6;
-	}
-
-	.list {
-		height: auto;
-		border-radius: 10rpx;
-		margin: 10rpx 20rpx 10rpx 20rpx;
-	}
-
-	.goods-item {
-		margin-bottom: 8rpx;
-	}
-
-	.item-box {
-		height: 230rpx;
-		width: 86%;
-		padding: 30rpx;
-		background-color: #fff;
-		border: 1rpx #FFF solid;
-		margin: 10rpx 0rpx;
-		border-radius: 10rpx;
-	}
-
-	.txt {
-		/* height: 50rpx; */
-		margin-bottom: 20rpx;
-	}
-
-	.t1 {
-		font-size: 32rpx;
-		font-weight: bold;
-		word-wrap: break-word;
-		position: relative;
-		top: 1rpx;
-		right: 5rpx;
-	}
-
-	.t4 {
-		display: flex;
-		position: relative;
-		bottom: 1rpx;
-		right: 5rpx;
-	}
-
-	.price {
-		color: #ef732a;
-		width: 400rpx;
-		font-weight: bold;
-	}
-
-	.car {
-		background-color: #0081ff;
-		width: 80rpx;
-		height: 70rpx;
-		border-radius: 40rpx;
-		text-align: center;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.tab {
-		position: fixed;
-		bottom: 1rpx;
-		width: 100%;
-		height: 100rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		border-top: #ffffff 1rpx solid;
-		background-color: #ffffff;
-	}
-
-
-	.tabBtn {
-		width: 35%;
-		height: 100%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		margin: 0 30rpx;
-	}
-
-	.pop {
-		width: 400rpx;
-		margin-top: 200rpx;
-	}
-
-	.custom-style {
-		width: 300rpx;
-	}
-
-	/* .active-btn {
-		width: 35%;
-		height: 100%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		color: #fff;
-		background-color: #00BFFF;
-	} */
-</style>

pages/oneMarket/order/order.vue

@@ -1,188 +0,0 @@
-<template>
-	<view>
-		<navigation-bar title="订单列表" background-color="#0081ff" front-color="#ffffff" :left-button="null" />
-		<u-tabs lineWidth="50" :list="list" itemStyle="height:90rpx;width: 100rpx;" :is-scroll="false"
-			:current="current" @change="change"></u-tabs>
-		<u-list style="margin-top: 10rpx;padding: 15rpx;" @scrolltolower="scrolltolower">
-			<u-list-item v-for="(item, index) in orderList" :key="index">
-				<view class="item-box">
-					<view class="goods-item">
-						<view class="good-row">
-							<view>
-								<view class="shop">
-									<!-- background-color: #eaf1fe; -->
-									<view class="shop-icon">
-										<uni-icons type="shop" color="#0081ff" size="26"></uni-icons>
-									</view>
-
-									<text style="font-size: 35rpx; margin-left: 8rpx;">{{item.shopName}}</text>
-								</view>
-							</view>
-							<view class="status" v-if="item.finishStatus">
-								<text style="color: #D3D3D3;">已完成</text>
-							</view>
-							<view class="status" v-else-if="item.resaleStatus">
-								<text style="color: #0e87ff;">组员确认中</text>
-							</view>
-							<view class="status" v-else-if="item.resaleStatus">
-								<text style="color: #0e87ff;">进境确认中</text>
-							</view>
-							<view class="status" v-else-if="item.resaleStatus">
-								<text style="color: #0e87ff;">进境申报中</text>
-							</view>
-							<view class="status" v-else-if="item.resaleStatus">
-								<text style="color: #00FF7F;">已进口</text>
-							</view>
-							<view class="status" v-else>
-								<text style="color: #ff660d;">商家未确认</text>
-							</view>
-						</view>
-					</view>
-					<view class="goods-item">
-						<view class="good-row">
-							<view>
-								<u--image radius="10" :showLoading="true" src="" width="250rpx"
-									height="210rpx"></u--image>
-							</view>
-							<view class="des">
-								<view style="font-size: 34rpx; height: 100rpx;">{{item.goodsNames}}</view>
-								<!-- <view style="font-size: 34rpx;">[老板力荐]鲜活小龙虾(帮剪头去虾线)约250g/份</view> -->
-								<view class="subtit">
-									<text style="margin-right: 20rpx;">{{item.totalWeight}}吨</text>
-									<text>{{item.tradeAreaName}}</text>
-								</view>
-								<view class="subtit">
-									{{item.tradeTime}}
-									<!-- 2023-08-03 16:41 -->
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="goods-item">
-						<view class="footer-item">
-							<view class="price">￥{{item.totalPrice}}</view>
-						</view>
-						<view class="footer-item">
-							<view style="margin: 15rpx 0rpx;"><button type="error" size="mini" :plain="true">查看详情</button></view>
-						</view>
-					</view>
-				</view>
-			</u-list-item>
-		</u-list>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				list: [{
-					name: '全部'
-				}, {
-					name: '待确认'
-				}, {
-					name: '申报中'
-				}, {
-					name: '已完成'
-				}, {
-					name: '转售中'
-				}, {
-					name: '已取消'
-				}],
-				current: 0,
-				orderList: [],
-				status: 0
-			}
-		},
-		onLoad() {
-			this.getOrderList()
-		},
-		methods: {
-			change(item) {
-				this.current = item.index
-			},
-			getOrderList() {
-				this.http.request({
-					url: '/level-one-server/app/TbOrder/getList',
-					success: res => {
-						this.orderList = res.data.data;
-					}
-				});
-			},
-			scrolltolower() {
-				this.getCartList()
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	// page{
-	// 	padding: 15rpx;
-	// }
-
-	.goods-item {
-		margin-bottom: 15rpx;
-	}
-
-	.good-row {
-		display: flex;
-		align-items: center;
-	}
-
-	.shop {
-		display: flex;
-		align-items: center;
-		width: 480rpx;
-	}
-
-	.shop-icon {
-		width: 60rpx;
-		height: 60rpx;
-		border-radius: 30rpx;
-		background-color: #eaf1fe;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.status {
-		width: 200rpx;
-		display: flex;
-		align-items: center;
-		justify-content: flex-end;
-	}
-
-	.des {
-		margin-left: 20rpx;
-		position: relative;
-		top: 1rpx;
-		height: 200rpx;
-	}
-
-	.subtit {
-		font-size: 28rpx;
-		color: #9C9C9C;
-		margin: 10rpx;
-	}
-
-	.footer-item {
-		display: flex;
-		justify-content: flex-end;
-		margin-top: -15rpx;
-		margin-bottom: 5rpx;
-	}
-	
-	.price{
-		font-size: 30rpx;
-	}
-
-	.item-box {
-		height: 370rpx;
-		width: 85%;
-		padding: 30rpx;
-		border: 1rpx #888 solid;
-		margin: 10rpx 15rpx;
-		border-radius: 10rpx;
-	}
-</style>

pages/personal/personal.vue

@@ -76,6 +76,14 @@
 						</view>
 					</view>
 				</view>
+				<view class="msn" @click="go('/pages/market/two/purchaser/address/list')">
+					<view class="out">
+						<view class="int">
+							<view class="icon ioc" style="background-color: #fff6e0; color: #f1ba41">&#xe623;</view>
+							<view class="tit">地址管理</view>
+						</view>
+					</view>
+				</view>
 				<view class="msn" @click="go('/pages/market/two/purchaser/order/list')">
 					<view class="out">
 						<view class="int">