From fe21e78da24828fec7693c02d76b16fac280e482 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Mon, 4 Nov 2024 14:14:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api.js                                         |    6 +
 components/base/topbar.vue                         |    3 +-
 pages/index/index.vue                              |    2 +-
 pages/index/tradingPlatform.vue                    |  585 +++++------
 .../auth/loginAndRegisterAndForgetPassword.vue     |  130 ++-
 pages_order/center/systemSet.vue                   |   81 +-
 pages_order/components/address/addressList.vue     |  465 ++++-----
 pages_order/components/order/orderList.vue         |    4 +-
 pages_order/order/offerOrBillLading.vue            | 1082 ++++++++++----------
 9 files changed, 1238 insertions(+), 1120 deletions(-)

diff --git a/api/api.js b/api/api.js
index 08a20fb..b5bdd07 100644
--- a/api/api.js
+++ b/api/api.js
@@ -62,6 +62,12 @@ const config = {
         method: 'POST',
 		limit : 1000,
     },
+    // 忘记密码
+    newPassword: {
+        url: '/alUser/newPassword',
+        method: 'POST',
+		limit : 1000,
+    },
 
     // ========================产品报价===============================
     // 清关申请
diff --git a/components/base/topbar.vue b/components/base/topbar.vue
index 996619f..a2c7973 100644
--- a/components/base/topbar.vue
+++ b/components/base/topbar.vue
@@ -9,7 +9,8 @@
     </view>
     <!--右边-->
     <view v-if="showRight == '1'" @click="switchIdentity" class="change">
-      {{ $t('pages.index.index.purchaser') }}
+      <!-- {{ $t('pages.index.index.purchaser') }} -->
+	  {{ userShop ? '供应商' : '采购商' }}
     </view>
   </view>
 </template>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 84d0dea..13de151 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -25,7 +25,7 @@
 					<view class="left">
 						<!--<span>Company Profile</span>-->
 						<span> {{ $t('pages.index.index.companyProfile') }}</span>
-            <span class="subText"> {{ $t('pages.index.index.aluminiumProduct') }}</span>
+						<span class="subText"> {{ $t('pages.index.index.aluminiumProduct') }}</span>
 					</view>
 					<view class="right">
 						随着全球经济的快速发展，我们这家领先的企业公司应运而生，致力于为客户提供卓越的服务和优质的产品。我们公司成立于2001年，总部位于深圳市横岗大厦，拥有广泛的业务领域和专业的团队，专注于实现客户的期望和需求。
diff --git a/pages/index/tradingPlatform.vue b/pages/index/tradingPlatform.vue
index f7eb95c..717ca95 100644
--- a/pages/index/tradingPlatform.vue
+++ b/pages/index/tradingPlatform.vue
@@ -1,304 +1,315 @@
 <template>
-  <view class="trading-platform">
+	<view class="trading-platform">
 
-    <topbar showRight="0"></topbar>
+		<topbar showRight="0"></topbar>
 
-    <view class="frame">
-      <!--顶部栏-->
+		<view class="frame">
+			<!--顶部栏-->
 
 
-      <!--折线图-->
-      <div ref="chartContainer" class="chart" style="width: 100%; height: 300px;">
+			<!--折线图-->
+			<div ref="chartContainer" class="chart" style="width: 100%; height: 300px;">
 
-      </div>
+			</div>
 
-      <!-- 供应商 -->
-      <view v-if="userShop" class="supplier">
+			<!-- 供应商 -->
+			<view v-if="userShop" class="supplier">
 
-        <view class="purchaser-title" style="">
-          <span class="active"> {{ $t('other.orderList') }}</span>
-        </view>
+				<view class="purchaser-title" style="">
+					<span class="active"> {{ $t('other.orderList') }}</span>
+				</view>
 
-        <view class="supplierList">
-          <orderList :list="list"/>
-        </view>
-      </view>
+				<view class="supplierList">
+					<orderList :list="list" />
+				</view>
+			</view>
 
-      <!-- 采购商 -->
-      <view v-else class="purchaser">
-        <!--切换现货/期货-->
-        <view class="purchaser-title" style="">
-          <span v-for="(item, index) in type" :class="actionIndex == index ? 'active' : 'noactive'"
-                @click="actionIndexChange(index)">{{ item.name }}</span>
-        </view>
-        <view class="productList">
-          <productList :list="list"/>
-        </view>
-      </view>
-    </view>
-    <tabber select="1"/>
-  </view>
+			<!-- 采购商 -->
+			<view v-else class="purchaser">
+				<!--切换现货/期货-->
+				<view class="purchaser-title" style="">
+					<span v-for="(item, index) in type" :class="actionIndex == index ? 'active' : 'noactive'"
+						@click="actionIndexChange(index)">{{ item.name }}</span>
+				</view>
+				<view class="productList">
+					<productList :list="list" />
+				</view>
+			</view>
+		</view>
+		<tabber select="1" />
+	</view>
 </template>
 
 <script>
-import tabber from '@/components/base/tabbar.vue'
-import topbar from "@/components/base/topbar.vue";
-import {mapGetters} from 'vuex'
-import ProductList from "@/components/user/productList.vue";
-import OrderList from "@/pages_order/components/order/orderList.vue";
-import mixinList from '@/mixins/list.js'
-import * as echarts from 'echarts';
-
-export default {
-  mixins: [mixinList],
-  components: {
-    OrderList,
-    ProductList,
-    topbar,
-    tabber,
-  },
-  computed: {
-    ...mapGetters(['userShop']),
-  },
-  data() {
-    return {
-      actionIndex: 0,
-      mixinsListApi: 'getMyProductlist',
-      type: [
-        {
-          name: this.$t('other.spotTrading')
-        },
-        {
-          name: this.$t('other.futuresTrading')
-        },
-      ],
-      chartData: [
-        // {date: "08/16", value: 10},
-        // {date: "08/17", value: 15},
-        // {date: "08/18", value: 45},
-        // {date: "08/19", value: 20},
-        // {date: "08/20", value: 18},
-        // {date: "08/21", value: 10},
-        // {date: "08/22", value: 15},
-        // {date: "08/23", value: 25},
-        // {date: "08/24", value: 35},
-        // {date: "08/25", value: 30},
-        // {date: "08/26", value: 25},
-        // {date: "08/27", value: 25},
-      ],
-      unit: '元/吨',
-    }
-  },
-  onLoad() {
-    if (this.userShop) {
-      // 现货/期货列表
-      this.mixinsListApi = 'productList'
-    } else {
-      // 交易平台挂单列表
-      this.mixinsListApi = 'productlist'
-      this.queryParams.productType = this.actionIndex
-    }
-  },
-  mounted() {
-    // this.getAlPrice()
-    // setTimeout(() => {
-    //   this.initChart();
-    // })
-  },
-  onShow() {
-    this.getAlPrice()
-  },
-  methods: {
-
-    getAlPrice() {
-
-      this.$api('getAlPrice', res => {
-        this.unit = res.result.unit
-        this.chartData = res.result.data
-        this.initChart(res.result.data)
-      })
-    },
-
-    initChart(data) {
-      var that = this;
-      const chartContainer = this.$refs.chartContainer;
-      if (!chartContainer) {
-        console.error("Chart container not found");
-        return;
-      }
-      const myChart = echarts.init(chartContainer);
-
-      // 提取日期和数值
-      const dates = data.map(item => item.date);
-      const values = data.map(item => item.value);
-
-      // 配置 ECharts
-      const option = {
-        backgroundColor: '#1B263B',
-        title: {
-          text: `${'铝均价' + data[0].value}`,
-          right: '10%',
-          top: '10%',
-          textStyle: {
-            color: '#fff',
-            fontSize: 14
-          }
-        },
-        tooltip: {
-          trigger: 'axis',
-          formatter: '{c0}',
-          backgroundColor: '#3A506B',
-          textStyle: {
-            color: '#fff'
-          }
-        },
-        grid: {
-          left: '10%',
-          right: '10%',
-          bottom: '20%'
-        },
-        xAxis: {
-          type: 'category',
-          data: dates,
-          axisLine: {
-            lineStyle: {
-              color: '#fff'
-            }
-          },
-          axisLabel: {
-            color: '#fff'
-          }
-        },
-        yAxis: {
-          type: 'value',
-          axisLine: {
-            lineStyle: {
-              color: '#fff'
-            }
-          },
-          axisLabel: {
-            color: '#fff',
-            formatter: function (value) {
-              return value;
-            }
-          }
-        },
-        series: [{
-          name: '长江',
-          type: 'line',
-          data: values,
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 8,
-          itemStyle: {
-            color: '#4ECDC4'
-          },
-          lineStyle: {
-            color: '#4ECDC4',
-            width: 2
-          },
-          areaStyle: {
-            color: 'rgba(78, 205, 196, 0.2)'
-          },
-        }]
-      };
-
-      myChart.setOption(option);
-    },
-
-    // 切换tab
-    actionIndexChange(index) {
-      // index为0时切换到现货交易，index为1时切换到期货交易
-      this.actionIndex = index;
-      this.queryParams.productType = this.actionIndex
-      this.getData()
-    },
-  }
-}
+	import tabber from '@/components/base/tabbar.vue'
+	import topbar from "@/components/base/topbar.vue";
+	import {
+		mapGetters
+	} from 'vuex'
+	import ProductList from "@/components/user/productList.vue";
+	import OrderList from "@/pages_order/components/order/orderList.vue";
+	import mixinList from '@/mixins/list.js'
+	import * as echarts from 'echarts';
+
+	export default {
+		mixins: [mixinList],
+		components: {
+			OrderList,
+			ProductList,
+			topbar,
+			tabber,
+		},
+		computed: {
+			...mapGetters(['userShop']),
+		},
+		data() {
+			return {
+				actionIndex: 0,
+				mixinsListApi: 'getMyProductlist',
+				type: [{
+						name: this.$t('other.spotTrading')
+					},
+					{
+						name: this.$t('other.futuresTrading')
+					},
+				],
+				chartData: [
+					// {date: "08/16", value: 10},
+					// {date: "08/17", value: 15},
+					// {date: "08/18", value: 45},
+					// {date: "08/19", value: 20},
+					// {date: "08/20", value: 18},
+					// {date: "08/21", value: 10},
+					// {date: "08/22", value: 15},
+					// {date: "08/23", value: 25},
+					// {date: "08/24", value: 35},
+					// {date: "08/25", value: 30},
+					// {date: "08/26", value: 25},
+					// {date: "08/27", value: 25},
+				],
+				unit: '元/吨',
+			}
+		},
+		onLoad() {
+			if (this.userShop) {
+				// 现货/期货列表
+				this.mixinsListApi = 'productList'
+			} else {
+				// 交易平台挂单列表
+				this.mixinsListApi = 'productlist'
+				this.queryParams.productType = this.actionIndex
+			}
+		},
+		mounted() {
+			// this.getAlPrice()
+			// setTimeout(() => {
+			//   this.initChart();
+			// })
+		},
+		onShow() {
+			this.getAlPrice()
+		},
+		methods: {
+
+			getAlPrice() {
+
+				this.$api('getAlPrice', res => {
+					this.unit = res.result.unit
+					this.chartData = res.result.data
+					this.initChart(res.result.data)
+				})
+			},
+
+			initChart(data) {
+				var that = this;
+				const chartContainer = this.$refs.chartContainer;
+				if (!chartContainer) {
+					console.error("Chart container not found");
+					return;
+				}
+				const myChart = echarts.init(chartContainer);
+
+				// 提取日期和数值
+				const dates = data.map(item => item.date).splice(0, 48);
+				const values = data.map(item => item.value).splice(0, 48);
+
+
+				// 计算铝均价
+				let sum = 0
+				values.forEach(n => {
+					sum += parseFloat(n)
+				})
+				
+				console.log(sum);
+
+				// 配置 ECharts
+				const option = {
+					backgroundColor: '#1B263B',
+					title: {
+						text: `${'铝均价' + (sum / values.length).toFixed(4)}`,
+						right: '10%',
+						top: '10%',
+						textStyle: {
+							color: '#fff',
+							fontSize: 14
+						}
+					},
+					tooltip: {
+						trigger: 'axis',
+						formatter: '{c0}',
+						backgroundColor: '#3A506B',
+						textStyle: {
+							color: '#fff'
+						}
+					},
+					grid: {
+						left: '10%',
+						right: '10%',
+						bottom: '20%'
+					},
+					xAxis: {
+						type: 'category',
+						data: dates,
+						axisLine: {
+							lineStyle: {
+								color: '#fff'
+							}
+						},
+						axisLabel: {
+							color: '#fff'
+						}
+					},
+					yAxis: {
+						type: 'value',
+						axisLine: {
+							lineStyle: {
+								color: '#fff'
+							}
+						},
+						axisLabel: {
+							color: '#fff',
+							formatter: function(value) {
+								return value;
+							}
+						}
+					},
+					series: [{
+						name: '长江',
+						type: 'line',
+						data: values,
+						smooth: true,
+						symbol: 'circle',
+						symbolSize: 8,
+						itemStyle: {
+							color: '#4ECDC4'
+						},
+						lineStyle: {
+							color: '#4ECDC4',
+							width: 2
+						},
+						areaStyle: {
+							color: 'rgba(78, 205, 196, 0.2)'
+						},
+					}]
+				};
+
+				myChart.setOption(option);
+			},
+
+			// 切换tab
+			actionIndexChange(index) {
+				// index为0时切换到现货交易，index为1时切换到期货交易
+				this.actionIndex = index;
+				this.queryParams.productType = this.actionIndex
+				this.getData()
+			},
+		}
+	}
 </script>
 
 <style scoped lang="scss">
-.trading-platform {
-  background-image: url('../../static/image/index/1.png');
-
-  .frame {
-
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    height: calc(100vh - 120rpx - 120rpx);
-
-    .chart {
-      height: 300px !important;
-      background-color: #1B263B; /* 背景颜色 */
-    }
-
-    .supplier {
-      height: 70%;
-      padding: 20rpx 20rpx;
-      background-image: url('../../static/image/index/1.png');
-      color: #FFF;
-      font-size: 32rpx;
-
-      .supplierList {
-        margin-top: 20rpx;
-        height: 92%;
-        overflow: auto;
-      }
-
-      .purchaser-title {
-        height: 8%;
-
-        .active {
-          text-decoration: underline;
-          width: 80rpx;
-          margin: 20rpx 20rpx 20rpx 20rpx;
-          padding: 10rpx 20rpx;
-
-        }
-
-
-        .noactive {
-          width: 80rpx;
-          margin: 20rpx 20rpx 20rpx 20rpx;
-          padding: 10rpx 20rpx;
-        }
-      }
-
-    }
-
-    .purchaser {
-      height: 60%;
-      padding: 20rpx 0;
-      color: #FFF;
-      font-size: 32rpx;
-
-
-      .purchaser-title {
-
-        .active {
-          text-decoration: underline;
-          width: 80rpx;
-          margin: 20rpx 20rpx 20rpx 20rpx;
-          padding: 10rpx 20rpx;
-
-        }
-
-
-        .noactive {
-          width: 80rpx;
-          margin: 20rpx 20rpx 20rpx 20rpx;
-          padding: 10rpx 20rpx;
-        }
-      }
-
-
-      .productList {
-        margin-top: 20rpx;
-        height: 60vh;
-        overflow: auto;
-      }
-    }
-  }
-}
+	.trading-platform {
+		background-image: url('../../static/image/index/1.png');
+
+		.frame {
+
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			height: calc(100vh - 120rpx - 120rpx);
+
+			.chart {
+				height: 300px !important;
+				background-color: #1B263B;
+				/* 背景颜色 */
+			}
+
+			.supplier {
+				height: 70%;
+				padding: 20rpx 20rpx;
+				background-image: url('../../static/image/index/1.png');
+				color: #FFF;
+				font-size: 32rpx;
+
+				.supplierList {
+					margin-top: 20rpx;
+					height: 92%;
+					overflow: auto;
+				}
+
+				.purchaser-title {
+					height: 8%;
+
+					.active {
+						text-decoration: underline;
+						width: 80rpx;
+						margin: 20rpx 20rpx 20rpx 20rpx;
+						padding: 10rpx 20rpx;
+
+					}
+
+
+					.noactive {
+						width: 80rpx;
+						margin: 20rpx 20rpx 20rpx 20rpx;
+						padding: 10rpx 20rpx;
+					}
+				}
+
+			}
+
+			.purchaser {
+				height: 60%;
+				padding: 20rpx 0;
+				color: #FFF;
+				font-size: 32rpx;
+
+
+				.purchaser-title {
+
+					.active {
+						text-decoration: underline;
+						width: 80rpx;
+						margin: 20rpx 20rpx 20rpx 20rpx;
+						padding: 10rpx 20rpx;
+
+					}
+
+
+					.noactive {
+						width: 80rpx;
+						margin: 20rpx 20rpx 20rpx 20rpx;
+						padding: 10rpx 20rpx;
+					}
+				}
+
+
+				.productList {
+					margin-top: 20rpx;
+					height: 60vh;
+					overflow: auto;
+				}
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages_order/auth/loginAndRegisterAndForgetPassword.vue b/pages_order/auth/loginAndRegisterAndForgetPassword.vue
index 8c66ecb..186b29e 100644
--- a/pages_order/auth/loginAndRegisterAndForgetPassword.vue
+++ b/pages_order/auth/loginAndRegisterAndForgetPassword.vue
@@ -3,8 +3,9 @@
 		<navbar :title="titleList[titleIndex]" leftClick @leftClick="$utils.navigateBack" />
 
 		<view class="frame">
+			
 			<!-- 登录和注册 -->
-			<view class="loginRegister" v-if='titleIndex!=2'>
+			<view class="loginRegister" v-if='titleIndex==1'>
 				<!-- 标题 -->
 				<view class="title">{{titleList[titleIndex]}}</view>
 
@@ -44,19 +45,19 @@
 			</view>
 
 			<!-- 忘记密码 -->
-			<view class='forgetPassword' v-if='titleIndex==2'>
+			<view class='forgetPassword' v-if='titleIndex != 1'>
 				<!-- 标题 -->
 				<view class="title">{{titleList[titleIndex]}}</view>
 
 				<!-- 表单 -->
 				<view class="form1">
 					<view class="userName">
-						<uv-input v-model="form1.userName" placeholder="请输入手机号" border="surround" shape='circle'
+						<uv-input v-model="form1.username" placeholder="请输入手机号" border="surround" shape='circle'
 							clearable :customStyle="{ backgroundColor: '#f6f6f6'}"></uv-input>
 					</view>
 					<view class="code">
 						<view class="left">
-							<uv-input v-model="form1.code" placeholder="请输入验证码" border="surround" shape='circle'
+							<uv-input v-model="form1.captcha" placeholder="请输入验证码" border="surround" shape='circle'
 								clearable :customStyle="{ backgroundColor: '#f6f6f6'}"></uv-input>
 						</view>
 						<view class="right">
@@ -70,11 +71,11 @@
 						</view>
 					</view>
 					<view class="password1">
-						<uv-input v-model="form1.password1" placeholder="设置您的新密码(6到50个字符)" password clearable
+						<uv-input v-model="form1.password" placeholder="设置您的新密码(6到50个字符)" password clearable
 							border="surround" shape='circle' :customStyle="{ backgroundColor: '#f6f6f6'}"></uv-input>
 					</view>
 					<view class="password2">
-						<uv-input v-model="form1.password2" placeholder="重新确认密码" password clearable border="surround"
+						<uv-input v-model="form1.newPassword" placeholder="重新确认密码" password clearable border="surround"
 							shape='circle' :customStyle="{ backgroundColor: '#f6f6f6'}"></uv-input>
 					</view>
 				</view>
@@ -128,10 +129,10 @@
 					captcha: '',
 				},
 				form1: {
-					userName: '',
-					code: '',
-					password1: '',
-					password2: '',
+					username: '',
+					captcha: '',
+					password: '',
+					newPassword: '',
 				},
 				tips: '获取验证码',
 				seconds: 60,
@@ -139,44 +140,115 @@
 		},
 		methods: {
 			submit() {
-				if (!this.checkboxValue.length) {
+				if (!this.checkboxValue.length && this.titleIndex != 2) {
 					return uni.showToast({
 						title: '请先同意隐私协议',
 						icon: 'none'
 					})
 				}
 
+				if (this.titleIndex == 0) {
+					// 注册
+					this.register()
+				} else if (this.titleIndex == 1) {
+					// 登录
+					this.login()
+				} else {
+					// 忘记密码
+					this.updatePassword()
+				}
+			},
+			// 登录
+			login(){
+				
 				if (this.$utils.verificationAll(this.form, {
 						username: '请输入账号',
 						password: '请输入密码',
 					})) {
 					return
 				}
-
+				
 				if (!this.$utils.verificationPhone(this.form.username)) {
 					return uni.showToast({
 						title: '请输入合法的手机号',
 						icon: 'none'
 					})
 				}
-
-				if (this.titleIndex == 0) {
-					// 注册
-					this.$api('registerUser', this.form, res => {
-						if (res.code == 200) {
-							this.titleIndex = 1
-							uni.showToast({
-								title: '注册成功，请登录！',
-								icon: 'none'
-							})
-						}
+				
+				// 登录
+				this.$store.commit('login', this.form)
+			},
+			// 注册
+			register(){
+				
+				if (this.$utils.verificationAll(this.form1, {
+						username: '请输入账号',
+						captcha : '请输入验证码',
+						password: '请输入密码',
+						newPassword: '请确认密码',
+					})) {
+					return
+				}
+				
+				if (!this.$utils.verificationPhone(this.form1.username)) {
+					return uni.showToast({
+						title: '请输入合法的手机号',
+						icon: 'none'
 					})
-				} else if (this.titleIndex == 1) {
-					// 登录
-					this.$store.commit('login', this.form)
-				} else {
-
 				}
+				
+				if (this.form1.password != this.form1.newPassword) {
+					return uni.showToast({
+						title: '密码与确认密码不一致',
+						icon: 'none'
+					})
+				}
+				
+				this.$api('registerUser', this.form1, res => {
+					if (res.code == 200) {
+						this.titleIndex = 1
+						uni.showToast({
+							title: '注册成功，请登录！',
+							icon: 'none'
+						})
+					}
+				})
+			},
+			updatePassword(){
+				
+				if (this.$utils.verificationAll(this.form1, {
+						username: '请输入账号',
+						captcha : '请输入验证码',
+						password: '请输入新密码',
+						newPassword: '请确认密码',
+					})) {
+					return
+				}
+				
+				if (!this.$utils.verificationPhone(this.form1.username)) {
+					return uni.showToast({
+						title: '请输入合法的手机号',
+						icon: 'none'
+					})
+				}
+				
+				if (this.form1.password != this.form1.newPassword) {
+					return uni.showToast({
+						title: '密码与确认密码不一致',
+						icon: 'none'
+					})
+				}
+				
+				this.$api('newPassword', this.form1, res => {
+					this.form1 = {}
+					if (res.code == 200) {
+						this.titleIndex = 1
+						uni.showToast({
+							title: '修改成功，请登录！',
+							icon: 'none'
+						})
+					}
+				})
 			},
 			// 切换页面
 			changePage(index) {
@@ -203,7 +275,7 @@
 						title: '正在获取验证码'
 					})
 					this.$api('sendSms', {
-						username: this.form1.userName,
+						username: this.form1.username,
 					}, res => {
 						if (res.code == 200) {
 							uni.hideLoading();
diff --git a/pages_order/center/systemSet.vue b/pages_order/center/systemSet.vue
index 9cd3202..c71a5a9 100644
--- a/pages_order/center/systemSet.vue
+++ b/pages_order/center/systemSet.vue
@@ -52,56 +52,62 @@
 						title: `${this.$t('pageTitle.accountSetting')}`,
 						itemList: [
 							// text: `${this.$t('pageTitle.switchAccount')}`
-							{
-								leftIcon: "../../static/image/center/1.svg",
-								text: `${this.$t('pageTitle.switchAccount')}`,
-								rightIcon: ">"
-							},
-							{
-								leftIcon: "../../static/image/center/2.svg",
-								text: `${this.$t('pageTitle.changePassword')}`,
-								rightIcon: ">"
-							},
+							// {
+							// 	leftIcon: "../../static/image/center/1.svg",
+							// 	text: `${this.$t('pageTitle.switchAccount')}`,
+							// 	rightIcon: ">"
+							// },
+							// {
+							// 	leftIcon: "../../static/image/center/2.svg",
+							// 	text: `${this.$t('pageTitle.changePassword')}`,
+							// 	rightIcon: ">"
+							// },
 							{
 								leftIcon: "../../static/image/center/3.svg",
 								text: this.$t('pageTitle.logout'),
 								rightIcon: ">",
 								type : 'logout',
 							},
-							{
-								leftIcon: "../../static/image/center/4.svg",
-								text: this.$t('pageTitle.addressList'),
-								rightIcon: ">",
-								toUrl: '/pages_order/center/addressListManage'
-							},
 						]
 					},
 					{
 						title: `${this.$t('pageTitle.systemSetting')}`,
-						itemList: [{
-								leftIcon: "../../static/image/center/1.svg",
-								text: `${this.$t('pageTitle.languageSwitch')}`,
-								rightIcon: ">"
-							},
+						itemList: [
+							// {
+							// 	leftIcon: "../../static/image/center/1.svg",
+							// 	text: `${this.$t('pageTitle.languageSwitch')}`,
+							// 	rightIcon: ">"
+							// },
 							{
 								leftIcon: "../../static/image/center/2.svg",
 								text: `${this.$t('pageTitle.versionUpdate')}`,
-								rightIcon: ">"
+								rightIcon: ">",
+								type : 'versionUpdate'
 							},
 							{
 								leftIcon: "../../static/image/center/3.svg",
 								text: this.$t('pageTitle.clearCache'),
-								rightIcon: ">"
+								rightIcon: ">",
+								type : 'clearCache',
 							},
 						]
 					},
 					{
 						title: `${this.$t('pageTitle.identitySetting')}`,
-						itemList: [{
-							leftIcon: "../../static/image/center/1.svg",
-							text: this.$t('pageTitle.switchIdentity'),
-							rightIcon: ">"
-						}, ]
+						itemList: [
+							{
+								leftIcon: "../../static/image/center/1.svg",
+								text: this.$t('pageTitle.switchIdentity'),
+								rightIcon: ">",
+								toUrl: '/pages_order/auth/selectionIdentity'
+							}, 
+							{
+								leftIcon: "../../static/image/center/4.svg",
+								text: this.$t('pageTitle.addressList'),
+								rightIcon: ">",
+								toUrl: '/pages_order/center/addressListManage'
+							},
+						]
 					}
 				],
 			}
@@ -122,6 +128,25 @@
 			logout(){
 				this.$store.commit('logout')
 			},
+			versionUpdate(){
+				uni.showToast({
+					title: '您当前已经是最新版本',
+					icon: 'none'
+				})
+			},
+			clearCache(){
+				uni.showModal({
+					title: '确认要清理缓存吗？',
+					success(res) {
+						if(res.confirm){
+							uni.showToast({
+								title: '缓存清理成功',
+								icon: 'none'
+							})
+						}
+					}
+				})
+			},
 		},
 	}
 </script>
diff --git a/pages_order/components/address/addressList.vue b/pages_order/components/address/addressList.vue
index 9496de9..b6d00a1 100644
--- a/pages_order/components/address/addressList.vue
+++ b/pages_order/components/address/addressList.vue
@@ -1,247 +1,232 @@
 <template>
-  <scroll-view
-      scroll-y="true"
-      :style="{height: height}"
-      @scrolltolower="moreAddress">
-    <uv-radio-group v-model="selectAddress"
-                    @change="editDefault"
-                    v-if="addressList.length > 0">
-      <view v-for="item in addressList" :key="item.id" class="address-item">
-
-        <view class="address-item-top"
-              @click="select(item)">
-          <view class="img-box">
-            <image src="/static/image/address/icon.png" mode="aspectFill"></image>
-          </view>
-
-          <view class="address-info">
-            <view class="user-info">
-              <text class="user-name">{{ item.name }}</text>
-              <text class="user-phone">{{ item.phone }}</text>
-              <text v-if="item.id == selectAddress" class="is-default">默认</text>
-            </view>
-
-            <view class="address-detail">
-              {{ item.address + " " + item.addressDetail }}
-            </view>
-          </view>
-        </view>
-
-        <view class="controls"
-              v-if="controls">
-
-          <view class="default-checkbox">
-            <uv-radio
-                :name="item.id"
-                label-disabled
-                size="30rpx"
-                icon-size="30rpx">
-              默认地址
-            </uv-radio>
-          </view>
-
-          <view class="edit-btn">
-            <uv-icon name="edit-pen"></uv-icon>
-            <text @click="editAddress(item)" class="control-title">编辑</text>
-          </view>
-
-          <view class="del-btn" @click="deleteAddress(item.id)">
-            <uv-icon name="trash"></uv-icon>
-            <text class="control-title" >删除</text>
-          </view>
-
-        </view>
-      </view>
-    </uv-radio-group>
-    <view
-        style="padding: 100rpx 0;"
-        v-else>
-      <uv-empty
-          mode="history"
-          textSize="28rpx"
-          iconSize="100rpx"/>
-    </view>
-  </scroll-view>
+	<scroll-view scroll-y="true" :style="{height: height}" @scrolltolower="moreAddress">
+		<uv-radio-group v-model="selectAddress" @change="editDefault" v-if="addressList.length > 0">
+			<view v-for="item in addressList" :key="item.id" class="address-item">
+
+				<view class="address-item-top" @click="select(item)">
+					<view class="img-box">
+						<image src="/static/image/address/icon.png" mode="aspectFill"></image>
+					</view>
+
+					<view class="address-info">
+						<view class="user-info">
+							<text class="user-name">{{ item.name }}</text>
+							<text class="user-phone">{{ item.phone }}</text>
+							<text v-if="item.id == selectAddress" class="is-default">默认</text>
+						</view>
+
+						<view class="address-detail">
+							{{ item.address + " " + item.addressDetail }}
+						</view>
+					</view>
+				</view>
+
+				<view class="controls" v-if="controls">
+
+					<view class="default-checkbox">
+						<uv-radio :name="item.id" label-disabled size="30rpx" icon-size="30rpx">
+							默认地址
+						</uv-radio>
+					</view>
+
+					<view class="edit-btn">
+						<uv-icon name="edit-pen"></uv-icon>
+						<text @click="editAddress(item)" class="control-title">编辑</text>
+					</view>
+
+					<view class="del-btn" @click="deleteAddress(item.id)">
+						<uv-icon name="trash"></uv-icon>
+						<text class="control-title">删除</text>
+					</view>
+
+				</view>
+			</view>
+		</uv-radio-group>
+		<view style="padding: 100rpx 0;" v-else>
+			<uv-empty mode="history" textSize="28rpx" iconSize="100rpx" />
+		</view>
+	</scroll-view>
 </template>
 
 <script>
-export default {
-  props : {
-    controls : {
-      default : false,
-      type : Boolean,
-    },
-    height : {
-      default : 'calc(90vh - 180rpx)'
-    }
-  },
-  data() {
-    return {
-      selectAddress : 0,
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10,
-      },
-      addressList: [],
-      total : 0,
-    }
-  },
-
-  methods: {
-    //获取地址列表
-    getAddressList() {
-      return new Promise((success, fail) => {
-        this.$api('addressList', this.queryParams, res => {
-          if (res.code == 200) {
-            console.log("res.result.records", res.result.records)
-            this.addressList = res.result.records || [];
-            this.total = res.result.total || 0;
-            this.addressList.forEach(n => { //筛选默认地址
-              if (n.defaultFlag == 1) {
-                this.selectAddress = n.id
-              }
-            })
-            success(res.result)
-          }
-        })
-      })
-    },
-    // 加载更多
-    moreAddress(){
-      if(this.queryParams.pageSize > this.total){
-        return
-      }
-      this.queryParams.pageSize += 10
-      this.getAddressList()
-    },
-    // 删除地址
-    deleteAddress(e){
-
-      this.$emit('deleteAddress', e)
-    },
-    // 修改地址
-    editAddress(e){
-      this.$emit('editAddress', e)
-    },
-    // 切换默认地址
-    editDefault(e){
-      this.$emit('editDefault', e)
-    },
-    // 选择了地址
-    select(e){
-      this.$emit('select', e)
-    },
-  }
-}
+	export default {
+		props: {
+			controls: {
+				default: false,
+				type: Boolean,
+			},
+			height: {
+				default: 'calc(90vh - 180rpx)'
+			}
+		},
+		data() {
+			return {
+				selectAddress: 0,
+				queryParams: {
+					pageNo: 1,
+					pageSize: 10,
+				},
+				addressList: [],
+				total: 0,
+			}
+		},
+		created() {
+		},
+		methods: {
+			//获取地址列表
+			getAddressList() {
+				return new Promise((success, fail) => {
+					this.$api('addressList', this.queryParams, res => {
+						if (res.code == 200) {
+							console.log("res.result.records", res.result.records)
+							this.addressList = res.result.records || [];
+							this.total = res.result.total || 0;
+							this.addressList.forEach(n => { //筛选默认地址
+								if (n.defaultFlag == 1) {
+									this.selectAddress = n.id
+								}
+							})
+							success(res.result)
+						}
+					})
+				})
+			},
+			// 加载更多
+			moreAddress() {
+				if (this.queryParams.pageSize > this.total) {
+					return
+				}
+				this.queryParams.pageSize += 10
+				this.getAddressList()
+			},
+			// 删除地址
+			deleteAddress(e) {
+
+				this.$emit('deleteAddress', e)
+			},
+			// 修改地址
+			editAddress(e) {
+				this.$emit('editAddress', e)
+			},
+			// 切换默认地址
+			editDefault(e) {
+				this.$emit('editDefault', e)
+			},
+			// 选择了地址
+			select(e) {
+				this.$emit('select', e)
+			},
+		}
+	}
 </script>
 
 <style scoped lang="scss">
-.address-item {
-  background: white;
-  border-radius: 20rpx;
-  overflow: hidden;
-  margin-bottom: 20rpx;
-  padding: 15rpx 15rpx 0rpx 15rpx;
-  width: 680rpx;
-
-  .address-item-top {
-    border-bottom: 1px dashed #D3D1D1;
-    display: flex;
-    align-items: center;
-    padding: 0rpx 0rpx 15rpx 0rpx;
-
-    .img-box {
-      width: 120rpx;
-      height: 120rpx;
-
-      image {
-        width: 75%;
-        height: 75%;
-        display: block;
-        margin: 12.5% auto;
-      }
-    }
-
-    .address-info {
-      width: calc(100% - 120rpx);
-      height: 100%;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-
-      .user-info {
-        display: flex;
-        align-items: center;
-
-        text {
-          display: block;
-          line-height: 40rpx;
-          margin-right: 20rpx;
-        }
-
-        .user-name,
-        .user-phone {
-          font-size: 30rpx;
-        }
-
-        .is-default {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          background: #FEB773;
-          color: white;
-          width: 80rpx;
-          height: 35rpx;
-          border-radius: 20rpx;
-          font-size: 22rpx;
-        }
-      }
-
-      .address-detail {
-        color: #4a4a4a;
-        font-size: 26rpx;
-        overflow: hidden;
-        display: -webkit-box;
-        -webkit-box-orient: vertical;
-        -webkit-line-clamp: 2;
-        text-overflow: ellipsis;
-      }
-    }
-  }
-
-  .controls {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    align-items: center;
-    font-size: 26rpx;
-    padding: 15rpx 15rpx 25rpx 15rpx;
-
-    .default-checkbox {
-      display: flex;
-
-      text {
-        margin-left: 8rpx;
-      }
-    }
-
-    .control-title {
-      height: 30rpx;
-      line-height: 30rpx;
-      color: #666666;
-    }
-
-    view {
-      display: flex;
-      align-items: center;
-    }
-
-    image {
-      width: 23rpx;
-      height: 23rpx;
-      vertical-align: middle;
-      margin-right: 8rpx;
-    }
-  }
-}
-</style>
+	.address-item {
+		background: white;
+		border-radius: 20rpx;
+		overflow: hidden;
+		margin-bottom: 20rpx;
+		padding: 15rpx 15rpx 0rpx 15rpx;
+		width: 680rpx;
+
+		.address-item-top {
+			border-bottom: 1px dashed #D3D1D1;
+			display: flex;
+			align-items: center;
+			padding: 0rpx 0rpx 15rpx 0rpx;
+
+			.img-box {
+				width: 120rpx;
+				height: 120rpx;
+
+				image {
+					width: 75%;
+					height: 75%;
+					display: block;
+					margin: 12.5% auto;
+				}
+			}
+
+			.address-info {
+				width: calc(100% - 120rpx);
+				height: 100%;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+
+				.user-info {
+					display: flex;
+					align-items: center;
+
+					text {
+						display: block;
+						line-height: 40rpx;
+						margin-right: 20rpx;
+					}
+
+					.user-name,
+					.user-phone {
+						font-size: 30rpx;
+					}
+
+					.is-default {
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						background: #FEB773;
+						color: white;
+						width: 80rpx;
+						height: 35rpx;
+						border-radius: 20rpx;
+						font-size: 22rpx;
+					}
+				}
+
+				.address-detail {
+					color: #4a4a4a;
+					font-size: 26rpx;
+					overflow: hidden;
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 2;
+					text-overflow: ellipsis;
+				}
+			}
+		}
+
+		.controls {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			align-items: center;
+			font-size: 26rpx;
+			padding: 15rpx 15rpx 25rpx 15rpx;
+
+			.default-checkbox {
+				display: flex;
+
+				text {
+					margin-left: 8rpx;
+				}
+			}
+
+			.control-title {
+				height: 30rpx;
+				line-height: 30rpx;
+				color: #666666;
+			}
+
+			view {
+				display: flex;
+				align-items: center;
+			}
+
+			image {
+				width: 23rpx;
+				height: 23rpx;
+				vertical-align: middle;
+				margin-right: 8rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_order/components/order/orderList.vue b/pages_order/components/order/orderList.vue
index cda3b94..85fca36 100644
--- a/pages_order/components/order/orderList.vue
+++ b/pages_order/components/order/orderList.vue
@@ -35,9 +35,9 @@
 
         <view class="tip">
           <!--审核状态 0审核中 1 审核通过 2审核未通过-->
-          <img v-if="item.auditStatus==0" src="../../static/order/1.svg" style="width: 100%;height: 100%;"/>
+          <img v-if="item.auditStatus==0" src="../../static/order/3.svg" style="width: 100%;height: 100%;"/>
           <img v-if="item.auditStatus==1" src="../../static/order/1.svg" style="width: 100%;height: 100%;"/>
-          <img v-if="item.auditStatus==2" src="../../static/order/3.svg" style="width: 100%;height: 100%;"/>
+          <img v-if="item.auditStatus==2" src="../../static/order/2.svg" style="width: 100%;height: 100%;"/>
         </view>
 
       </view>
diff --git a/pages_order/order/offerOrBillLading.vue b/pages_order/order/offerOrBillLading.vue
index b6dae24..536f670 100644
--- a/pages_order/order/offerOrBillLading.vue
+++ b/pages_order/order/offerOrBillLading.vue
@@ -1,554 +1,572 @@
 <template>
-  <view class="page">
+	<view class="page">
 
-    <navbar :title="titleList[titleIndex]" leftClick @leftClick="$utils.navigateBack"/>
+		<navbar :title="titleList[titleIndex]" leftClick @leftClick="$utils.navigateBack" />
 
-    <view class="frame">
-      <view class="title">
+		<view class="frame">
+			<view class="title">
 				<span
-            style="width: 10rpx;height: 40rpx;background-color: #1f1c39;border-radius: 10rpx;overflow: hidden;"></span>
-        <span>{{ $t('other.aluminumProducts') }}</span>
-      </view>
-
-      <view class="basic-info">
-
-        <!--供应商名称-->
-        <view v-if="titleIndex == 1" class="item">
-          <view>{{ $t('other.supplierName') }}</view>
-          <view>华南铝业有限公司</view>
-        </view>
-
-        <!--商品规格-->
-        <view class="item">
-          <view>{{ $t('components.productSpe') }}</view>
-          <view>铝制品(Al>96%)</view>
-        </view>
-
-
-        <view class="addressA" @click="openAddress">
-          <view class="title">{{ $t('components.shippingAddress') }}</view>
-          <view class="address" style="width: 70%">
-            <image mode="" src="/static/image/address/selectIcon.png"></image>
-            <view class="">
-              {{ address.name }}
-            </view>
-            <view class="">
-              {{ address.addressDetail }}
-            </view>
-            <view class="icon">
-              <uv-icon name="arrow-right" size="30rpx"></uv-icon>
-            </view>
-          </view>
-        </view>
-
-
-        <!--提货地点-->
-        <!--<view class="currentRegion">-->
-        <!--	<view>{{ $t('components.pickupLocation') }}</view>-->
-        <!--	<view @click.stop="selectAddr">-->
-        <!--		<input class="input" disabled v-model="form.currentRegion"-->
-        <!--			:placeholder=" $t('components.selectRegion')">-->
-        <!--		</input>-->
-        <!--		<view class="orientation">-->
-        <!--			<img src="../../static/image/address/selectIcon.png"-->
-        <!--				style="width:30rpx;height: 30rpx;margin:5rpx 5rpx 5rpx 5rpx;">-->
-        <!--		</view>-->
-        <!--	</view>-->
-        <!--</view>-->
-
-        <!--详细地址-->
-        <!--<view class="item">-->
-        <!--	<view>{{ $t('components.detailedAddress') }}</view>-->
-        <!--	<view>-->
-        <!--		<input v-model="form.address" :placeholder="$t('components.enterDetailedAddress') "-->
-        <!--			clearable></input>-->
-        <!--	</view>-->
-        <!--</view>-->
-
-        <!--交货日期-->
-        <view class="delivery-date">
-          <view>{{ $t('components.deliveryDate') }}</view>
-          <view class="value">
-            <view class="dateTimeCls">
-              <view class="date" @click="startDateOpen">
-                {{ form.transactionTime }}
-                <uv-datetime-picker ref="startDateRef" v-model="form.transactionTime" mode="date"
-                                    @confirm="startDateChange"></uv-datetime-picker>
-              </view>
-              <view class="img">
-                >
-              </view>
-            </view>
-          </view>
-        </view>
-
-        <!--暂定数量-->
-        <view class="tentativeQuantity">
-          <view class="key">{{ $t('other.tentativeQuantity') }}</view>
-          <view class="value">
-            <uv-number-box v-model="form.num"></uv-number-box>
-          </view>
-        </view>
-
-        <!--单价-->
-        <view class="item">
-          <view>{{ $t('components.unitPrice') }}</view>
-          <view>
-            <input v-model="form.price" clearable></input>
-          </view>
-        </view>
-
-        <!--提交报价和提交审核-->
-        <view class="btns">
+					style="width: 10rpx;height: 40rpx;background-color: #1f1c39;border-radius: 10rpx;overflow: hidden;"></span>
+				<span>{{ $t('other.aluminumProducts') }}</span>
+			</view>
+
+			<view class="basic-info">
+
+				<!--供应商名称-->
+				<!-- <view v-if="titleIndex == 1" class="item">
+					<view>{{ $t('other.supplierName') }}</view>
+					<view>华南铝业有限公司</view>
+				</view> -->
+
+				<!--商品规格-->
+				<view class="item">
+					<view>{{ $t('components.productSpe') }}</view>
+					<view>铝制品(Al>96%)</view>
+				</view>
+
+
+				<view class="addressA" @click="openAddress">
+					<view class="title">提货地点</view>
+					<view class="address" style="width: 70%">
+						<image mode="" src="/static/image/address/selectIcon.png"></image>
+						<view class="">
+							{{ address.name }}
+						</view>
+						<view class="icon">
+							<uv-icon name="arrow-right" size="30rpx"></uv-icon>
+						</view>
+					</view>
+				</view>
+
+
+				<!--提货地点-->
+				<!--<view class="currentRegion">-->
+				<!--	<view>{{ $t('components.pickupLocation') }}</view>-->
+				<!--	<view @click.stop="selectAddr">-->
+				<!--		<input class="input" disabled v-model="form.currentRegion"-->
+				<!--			:placeholder=" $t('components.selectRegion')">-->
+				<!--		</input>-->
+				<!--		<view class="orientation">-->
+				<!--			<img src="../../static/image/address/selectIcon.png"-->
+				<!--				style="width:30rpx;height: 30rpx;margin:5rpx 5rpx 5rpx 5rpx;">-->
+				<!--		</view>-->
+				<!--	</view>-->
+				<!--</view>-->
+
+				<!--详细地址-->
+				<view class="item" v-if="address.addressDetail">
+					<view>{{ $t('components.detailedAddress') }}</view>
+					<view>
+						<view class="">
+							{{ address.address }}
+						</view>
+						<view class="">
+							{{ address.addressDetail }}
+						</view>
+					</view>
+				</view>
+
+				<!--交货日期-->
+				<view class="delivery-date" @click="startDateOpen">
+					<view>{{ $t('components.deliveryDate') }}</view>
+					<view class="value">
+						<view class="dateTimeCls">
+							<view class="date">
+								{{ form.transactionTime }}
+								<uv-datetime-picker ref="startDateRef" v-model="form.transactionTime" mode="date"
+									@confirm="startDateChange"></uv-datetime-picker>
+							</view>
+							<view class="img">
+								>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<!--暂定数量-->
+				<view class="tentativeQuantity">
+					<view class="key">{{ $t('other.tentativeQuantity') }}</view>
+					<view class="value">
+						<uv-number-box v-model="form.num"></uv-number-box>
+					</view>
+				</view>
+
+				<!--单价-->
+				<view class="item">
+					<view>{{ $t('components.unitPrice') }}</view>
+					<view>
+						<input v-model="form.price" clearable></input>
+					</view>
+				</view>
+
+				<!--提交报价和提交审核-->
+				<view class="btns">
 					<span @click="confirmBtn" class="ljxd">
 						{{ titleIndex == 0 ? $t('other.submitQuotation') : $t('other.submitReview') }}
 					</span>
-          <span class="lxwm" @click="contactUs">
+					<span class="lxwm" @click="contactUs">
 						{{ $t('components.contactUs') }}
 					</span>
-          <span class="tip">{{ $t('components.contactTip') }}</span>
-        </view>
+					<span class="tip">{{ $t('components.contactTip') }}</span>
+				</view>
 
-      </view>
-    </view>
+			</view>
+		</view>
 
-    <!-- 联系客服弹框 -->
-    <customerServicePopup ref="customerServicePopup"/>
+		<!-- 联系客服弹框 -->
+		<customerServicePopup ref="customerServicePopup" />
 
 
-    <!-- 地址选择弹框 -->
-    <uv-popup ref="addressPopup" :round="30">
-      <addressList ref="addressList" height="60vh" @select="selectAddress"/>
-    </uv-popup>
+		<!-- 地址选择弹框 -->
+		<uv-popup ref="addressPopup" :round="30">
+			<addressList ref="addressList" height="60vh" @select="selectAddress" />
+		</uv-popup>
 
-  </view>
+	</view>
 </template>
 
 <script>
-import topbar from "@/components/base/topbar.vue";
-import tabber from "@/components/base/tabbar.vue";
-import customerServicePopup from "@/components/config/customerServicePopup.vue";
-import Position from "@/utils/position";
-import dayjs from "dayjs";
-import AddressList from "@/pages_order/components/address/addressList.vue";
-
-export default {
-  name: "offer",
-  components: {
-    AddressList,
-    customerServicePopup,
-    tabber,
-    topbar
-  },
-  onLoad(options) {
-    this.titleIndex = options.titleIndex;
-  },
-  data() {
-    return {
-      titleIndex: 0,
-      titleList: [
-        // 0 供应商报价
-        this.$t('pages.index.index.supplierQuotation'),
-        this.$t('pages.index.index.supplierBillLading')
-      ],
-      form: {
-        "addressId": "",
-        "num": 0,
-        "price": 0,
-        "transactionTime": ""
-      },
-      address: {
-        name: '请选择地址',
-        addressDetail: '',
-      },
-      addressTotal: 0,
-    }
-  },
-  onShow() {
-    this.getAddressListA()
-  },
-  methods: {
-
-    //获取地址列表
-    getAddressListA() {
-      this.$refs.addressList.getAddressList()
-    },
-
-    // 提交报价/提交审核
-    confirmBtn() {
-      //TODO
-      this.form.addressId = this.address.id
-      this.$api('addProduct', this.form, res => {
-        if (res.code == 200) {
-          uni.showToast({
-            title: '提交成功',
-            icon: 'none'
-          })
-          setTimeout(() => {
-            uni.navigateTo({
-              url: '/pages/index/index'
-            })
-          }, 1500)
-        }
-      })
-    },
-
-    openAddress() {
-      // if (this.addressTotal == 0) {
-      //   this.$refs.popup.close()
-      //   return uni.navigateTo({
-      //     url: '/pages_order/mine/address?type=back'
-      //   })
-      // }
-      this.$refs.addressPopup.open('bottom')
-      // this.getAddressList()
-    },
-    // 选择地址
-    selectAddress(e) {
-      this.address = e
-      this.$refs.addressPopup.close()
-    },
-
-
-    startDateChange(val) {
-      this.$nextTick(() => {
-        this.form.transactionTime = dayjs(val.value).format("YYYY-MM-DD")
-      });
-    },
-    startDateOpen() {
-      this.$refs.startDateRef.open();
-    },
-
-    // 联系我们
-    contactUs() {
-      this.$refs.customerServicePopup.open()
-    },
-
-    //地图上选择地址
-    selectAddr() {
-      Position.getLocation(res => {
-        Position.selectAddress(res.longitude, res.latitude, success => {
-          this.setAddress(success)
-        })
-      })
-      Position.getLocationDetail(res => {
-        console.log(res);
-        this.form.address = res
-      })
-    },
-  },
-}
+	import topbar from "@/components/base/topbar.vue";
+	import tabber from "@/components/base/tabbar.vue";
+	import customerServicePopup from "@/components/config/customerServicePopup.vue";
+	import Position from "@/utils/position";
+	import dayjs from "dayjs";
+	import AddressList from "@/pages_order/components/address/addressList.vue";
+
+	export default {
+		name: "offer",
+		components: {
+			AddressList,
+			customerServicePopup,
+			tabber,
+			topbar
+		},
+		onLoad(options) {
+			this.titleIndex = options.titleIndex;
+		},
+		data() {
+			return {
+				titleIndex: 0,
+				titleList: [
+					// 0 供应商报价
+					this.$t('pages.index.index.supplierQuotation'),
+					this.$t('pages.index.index.supplierBillLading')
+				],
+				form: {
+					"addressId": "",
+					"num": 0,
+					"price": 0,
+					"transactionTime": ""
+				},
+				address: {
+					name: '请选择地址',
+					addressDetail: '',
+				},
+				addressTotal: 0,
+			}
+		},
+		onShow() {},
+		methods: {
+
+			//获取地址列表
+			getAddressListA() {
+				this.$refs.addressList
+					.getAddressList()
+					.then(res => {
+						if (res == 0) {
+							this.$refs.popup.close()
+							return uni.navigateTo({
+								url: '/pages_order/mine/address?type=back'
+							})
+						}
+					})
+
+			},
+
+			// 提交报价/提交审核
+			confirmBtn() {
+				//TODO
+
+				this.form.addressId = this.address.id
+
+				if (this.$utils.verificationAll(this.form, {
+						"addressId": '请选择提货地点',
+						"num": '请选择吨数',
+						"price": '请输入单价',
+						"transactionTime": '请选择交货时间',
+					})) {
+					return
+				}
+
+				this.$api('addProduct', this.form, res => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: '提交成功',
+							icon: 'none'
+						})
+						setTimeout(() => {
+							uni.navigateTo({
+								url: '/pages/index/index'
+							})
+						}, 1500)
+					}
+				})
+			},
+
+			openAddress() {
+				this.$refs.addressPopup.open('bottom')
+				// this.getAddressList()
+
+				this.$nextTick(() => {
+					this.getAddressListA()
+				})
+			},
+			// 选择地址
+			selectAddress(e) {
+				this.address = e
+				this.$refs.addressPopup.close()
+			},
+
+
+			startDateChange(val) {
+				this.$nextTick(() => {
+					this.form.transactionTime = dayjs(val.value).format("YYYY-MM-DD")
+				});
+			},
+			startDateOpen() {
+				this.$refs.startDateRef.open();
+			},
+
+			// 联系我们
+			contactUs() {
+				this.$refs.customerServicePopup.open()
+			},
+
+			//地图上选择地址
+			selectAddr() {
+				Position.getLocation(res => {
+					Position.selectAddress(res.longitude, res.latitude, success => {
+						this.setAddress(success)
+					})
+				})
+				Position.getLocationDetail(res => {
+					console.log(res);
+					this.form.address = res
+				})
+			},
+		},
+	}
 </script>
 
 
 <style scoped lang="scss">
-.page {
-  height: 100vh;
-
-  .frame {
-    background-color: #FFF;
-
-    .title {
-      display: flex;
-      font-size: 30rpx;
-      font-weight: 700;
-      padding: 0rpx 0 0rpx 20rpx;
-      margin: 20rpx 0 0 0;
-
-      > span:nth-of-type(1) {
-        margin: 4rpx 0 0 8rpx;
-        background-color: #FFF;
-      }
-
-      > span:nth-of-type(2) {
-        margin: 0 0 0 8rpx;
-        background-color: #FFF;
-      }
-    }
-
-    .basic-info {
-      display: flex;
-      flex-direction: column;
-      gap: 10rpx;
-      //margin-top: 20rpx;
-      padding: 20rpx 20rpx 20rpx 20rpx;
-
-
-      .addressA {
-        display: flex;
-        align-items: center;
-        background-color: #FFF;
-        height: 80rpx;
-        // margin: 10rpx 0 0 0;
-        //padding: 10rpx 0 0 20rpx;
-
-        .title {
-          display: flex;
-          align-items: center;
-          justify-content: flex-start;
-          font-weight: 400;
-          width: 30%;
-        }
-
-        .address {
-          width: 70%;
-          display: flex;
-          padding: 20rpx;
-          background-color: #fff;
-
-          image {
-            width: 30rpx;
-            height: 30rpx;
-            margin: 10rpx;
-          }
-
-          view {
-
-            //margin: 20rpx;
-            overflow: hidden; //超出的文本隐藏
-            text-overflow: ellipsis; //溢出用省略号显示
-            white-space: nowrap; //溢出不换行
-          }
-
-          .icon {
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            margin-left: auto;
-          }
-        }
-      }
-
-
-      .delivery-date {
-        display: flex;
-        align-items: center;
-        background-color: #FFF;
-        height: 80rpx;
-        // margin: 10rpx 0 0 0;
-        padding: 10rpx 0 0 20rpx;
-
-        > view:nth-of-type(1) {
-          width: 30%;
-          // font-weight: 700;
-        }
-
-
-        .value {
-          width: 70%;
-          border-radius: 10rpx;
-          overflow: hidden;
-
-          .dateTimeCls {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            width: 100%;
-            height: 80%;
-            //border: 1px solid #b0b2b3;
-            padding: 5rpx;
-            border-radius: 20rpx;
-
-            .date {
-              font-size: 30rpx;
-              display: flex;
-              align-items: center;
-              width: 80%;
-              height: 100%;
-              color: #000;
-
-            }
-
-            .img {
-              display: flex;
-              justify-content: center;
-              align-items: center;
-              //margin-left: 50rpx;
-              width: 20%;
-              //height: 100%;
-            }
-          }
-
-        }
-
-
-      }
-
-      .tentativeQuantity {
-        display: flex;
-        align-items: center;
-        background-color: #FFF;
-        height: 80rpx;
-        // margin: 10rpx 0 0 0;
-        padding: 10rpx 0 0 20rpx;
-
-        .key {
-          width: 30%;
-        }
-
-        .value {
-          width: 70%;
-          border-radius: 10rpx;
-          overflow: hidden;
-        }
-
-      }
-
-
-      .Tip {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-
-        .span {
-          color: #999;
-          font-size: 24rpx;
-        }
-      }
-
-      .btns {
-        width: 100%;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: center;
-        gap: 20rpx;
-
-        .ljxd {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          width: 500rpx;
-          height: 70rpx;
-          border-radius: 40rpx;
-          color: #FFF;
-          font-size: 28rpx;
-          margin: 20rpx 10rpx 0 0;
-          background: $uni-color;
-          //margin-top: 20rpx;
-          border-radius: 40rpx;
-        }
-
-        .lxwm {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          width: 500rpx;
-          height: 70rpx;
-          border-radius: 40rpx;
-          color: #000000;
-          font-size: 28rpx;
-          margin: 20rpx 10rpx 0 0;
-          background: #f1f1f1;
-          //margin-top: 20rpx;
-          border-radius: 40rpx;
-        }
-
-        .tip {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          font-size: 24rpx;
-          color: #999;
-          //width: 500rpx;
-        }
-      }
-
-      .item {
-        display: flex;
-        align-items: center;
-        background-color: #FFF;
-        height: 80rpx;
-        // margin: 10rpx 0 0 0;
-        padding: 10rpx 0 0 20rpx;
-
-        > view:nth-of-type(1) {
-          width: 30%;
-          // font-weight: 700;
-        }
-
-        > view:nth-of-type(2) {
-          width: 70%;
-          border-radius: 10rpx;
-          overflow: hidden;
-
-
-          input {
-            background-color: #FFF;
-            font-size: 28rpx;
-            padding: 16rpx 8rpx 16rpx 15rpx;
-          }
-        }
-      }
-
-      .performanceBond {
-        display: flex;
-        align-items: center;
-        background-color: #FFF;
-        height: 80rpx;
-        // margin: 10rpx 0 0 0;
-        padding: 10rpx 0 0 20rpx;
-
-        .key {
-          width: 30%;
-          // font-weight: 700;
-        }
-
-        .value {
-          width: 70%;
-          border-radius: 10rpx;
-          overflow: hidden;
-
-
-          input {
-            background-color: #FFF;
-            font-size: 28rpx;
-            padding: 16rpx 8rpx 16rpx 15rpx;
-          }
-        }
-      }
-
-      .currentRegion {
-        display: flex;
-        align-items: center;
-        background-color: #FFF;
-        height: 80rpx;
-        // margin: 10rpx 0 0 0;
-        padding: 10rpx 0 0 20rpx;
-
-        > view:nth-of-type(1) {
-          width: 30%;
-          // font-weight: 700;
-        }
-
-        > view:nth-of-type(2) {
-          width: 70%;
-          padding: 0 20rpx 0 0;
-          display: flex;
-
-          .input {
-            background-color: #f5f5f5;
-            // color: #a4a4a4;
-            font-size: 28rpx;
-            padding: 8rpx 8rpx 8rpx 15rpx;
-            width: 350rpx;
-          }
-
-          .orientation {
-            display: flex;
-            padding: 10rpx 10rpx 10rpx 20rpx;
-            font-size: 30rpx;
-            color: #FBAB32;
-            flex-direction: column;
-            justify-content: center;
-            align-items: center;
-          }
-
-
-        }
-      }
-
-    }
-  }
-}
+	.page {
+		height: 100vh;
+
+		.frame {
+			background-color: #FFF;
+
+			.title {
+				display: flex;
+				font-size: 30rpx;
+				font-weight: 700;
+				padding: 0rpx 0 0rpx 20rpx;
+				margin: 20rpx 0 0 0;
+
+				>span:nth-of-type(1) {
+					margin: 4rpx 0 0 8rpx;
+					background-color: #FFF;
+				}
+
+				>span:nth-of-type(2) {
+					margin: 0 0 0 8rpx;
+					background-color: #FFF;
+				}
+			}
+
+			.basic-info {
+				display: flex;
+				flex-direction: column;
+				gap: 10rpx;
+				//margin-top: 20rpx;
+				padding: 20rpx 20rpx 20rpx 20rpx;
+
+
+				.addressA {
+					display: flex;
+					align-items: center;
+					background-color: #FFF;
+					height: 80rpx;
+					// margin: 10rpx 0 0 0;
+					//padding: 10rpx 0 0 20rpx;
+
+					.title {
+						display: flex;
+						align-items: center;
+						justify-content: flex-start;
+						font-weight: 400;
+						width: 30%;
+					}
+
+					.address {
+						width: 70%;
+						display: flex;
+						padding: 20rpx;
+						background-color: #fff;
+
+						image {
+							width: 30rpx;
+							height: 30rpx;
+							margin: 10rpx;
+						}
+
+						view {
+
+							//margin: 20rpx;
+							overflow: hidden; //超出的文本隐藏
+							text-overflow: ellipsis; //溢出用省略号显示
+							white-space: nowrap; //溢出不换行
+						}
+
+						.icon {
+							display: flex;
+							justify-content: center;
+							align-items: center;
+							margin-left: auto;
+						}
+					}
+				}
+
+
+				.delivery-date {
+					display: flex;
+					align-items: center;
+					background-color: #FFF;
+					height: 80rpx;
+					// margin: 10rpx 0 0 0;
+					padding: 10rpx 0 0 20rpx;
+
+					>view:nth-of-type(1) {
+						width: 30%;
+						// font-weight: 700;
+					}
+
+
+					.value {
+						width: 70%;
+						border-radius: 10rpx;
+						overflow: hidden;
+
+						.dateTimeCls {
+							display: flex;
+							align-items: center;
+							justify-content: space-between;
+							width: 100%;
+							height: 80%;
+							//border: 1px solid #b0b2b3;
+							padding: 5rpx;
+							border-radius: 20rpx;
+
+							.date {
+								font-size: 30rpx;
+								display: flex;
+								align-items: center;
+								width: 80%;
+								height: 100%;
+								color: #000;
+
+							}
+
+							.img {
+								display: flex;
+								justify-content: center;
+								align-items: center;
+								//margin-left: 50rpx;
+								width: 20%;
+								//height: 100%;
+							}
+						}
+
+					}
+
+
+				}
+
+				.tentativeQuantity {
+					display: flex;
+					align-items: center;
+					background-color: #FFF;
+					height: 80rpx;
+					// margin: 10rpx 0 0 0;
+					padding: 10rpx 0 0 20rpx;
+
+					.key {
+						width: 30%;
+					}
+
+					.value {
+						width: 70%;
+						border-radius: 10rpx;
+						overflow: hidden;
+					}
+
+				}
+
+
+				.Tip {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+
+					.span {
+						color: #999;
+						font-size: 24rpx;
+					}
+				}
+
+				.btns {
+					width: 100%;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: center;
+					gap: 20rpx;
+
+					.ljxd {
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						width: 500rpx;
+						height: 70rpx;
+						border-radius: 40rpx;
+						color: #FFF;
+						font-size: 28rpx;
+						margin: 20rpx 10rpx 0 0;
+						background: $uni-color;
+						//margin-top: 20rpx;
+						border-radius: 40rpx;
+					}
+
+					.lxwm {
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						width: 500rpx;
+						height: 70rpx;
+						border-radius: 40rpx;
+						color: #000000;
+						font-size: 28rpx;
+						margin: 20rpx 10rpx 0 0;
+						background: #f1f1f1;
+						//margin-top: 20rpx;
+						border-radius: 40rpx;
+					}
+
+					.tip {
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						font-size: 24rpx;
+						color: #999;
+						//width: 500rpx;
+					}
+				}
+
+				.item {
+					display: flex;
+					align-items: center;
+					background-color: #FFF;
+					height: 80rpx;
+					// margin: 10rpx 0 0 0;
+					padding: 10rpx 0 0 20rpx;
+
+					>view:nth-of-type(1) {
+						width: 30%;
+						// font-weight: 700;
+					}
+
+					>view:nth-of-type(2) {
+						width: 70%;
+						border-radius: 10rpx;
+						overflow: hidden;
+
+
+						input {
+							background-color: #FFF;
+							font-size: 28rpx;
+							padding: 16rpx 8rpx 16rpx 15rpx;
+						}
+					}
+				}
+
+				.performanceBond {
+					display: flex;
+					align-items: center;
+					background-color: #FFF;
+					height: 80rpx;
+					// margin: 10rpx 0 0 0;
+					padding: 10rpx 0 0 20rpx;
+
+					.key {
+						width: 30%;
+						// font-weight: 700;
+					}
+
+					.value {
+						width: 70%;
+						border-radius: 10rpx;
+						overflow: hidden;
+
+
+						input {
+							background-color: #FFF;
+							font-size: 28rpx;
+							padding: 16rpx 8rpx 16rpx 15rpx;
+						}
+					}
+				}
+
+				.currentRegion {
+					display: flex;
+					align-items: center;
+					background-color: #FFF;
+					height: 80rpx;
+					// margin: 10rpx 0 0 0;
+					padding: 10rpx 0 0 20rpx;
+
+					>view:nth-of-type(1) {
+						width: 30%;
+						// font-weight: 700;
+					}
+
+					>view:nth-of-type(2) {
+						width: 70%;
+						padding: 0 20rpx 0 0;
+						display: flex;
+
+						.input {
+							background-color: #f5f5f5;
+							// color: #a4a4a4;
+							font-size: 28rpx;
+							padding: 8rpx 8rpx 8rpx 15rpx;
+							width: 350rpx;
+						}
+
+						.orientation {
+							display: flex;
+							padding: 10rpx 10rpx 10rpx 20rpx;
+							font-size: 30rpx;
+							color: #FBAB32;
+							flex-direction: column;
+							justify-content: center;
+							align-items: center;
+						}
+
+
+					}
+				}
+
+			}
+		}
+	}
 </style>
\ No newline at end of file