diff --git a/components/user/productList.vue b/components/user/productList.vue
index 2983d7b..cfd180e 100644
--- a/components/user/productList.vue
+++ b/components/user/productList.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="list">
     <view class="item"
-          v-for="(item, index) in productList"
+          v-for="(item, index) in list"
           @click="immediatePurchase(item)"
           :key="index">
       <image
@@ -32,7 +32,7 @@
 export default {
   name: "productList",
   props: {
-    productList: {
+    list: {
       type: Array,
       default: false
     },
diff --git a/locale/en.json b/locale/en.json
index 161fbf1..b04fe37 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -196,7 +196,10 @@
 		"supplierOrder": "Supplier Listing",
 		"myOrders": "My Listings",
 		"payDeposit": "Pay Bond",
-		"supplierBilLading": "Supplier bill of lading"
+		"supplierBilLading": "Supplier bill of lading",
+		"backOrderTitle": "Cancel pending order",
+		"backOrderTitleConfirm": "Do you confirm the withdrawal? Data cannot be recovered after withdrawal",
+		"backOrderSuccess": "Successful withdrawal"
 	},
 	"pages": {
 		"index": {
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index 1e8348b..aa3d505 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -198,7 +198,10 @@
 		"supplierBilLading": "供应商提单",
 		"supplierOrder": "供应商挂单",
 		"myOrders": "我的挂单",
-		"payDeposit": "支付保证金"
+		"payDeposit": "支付保证金",
+		"backOrderTitle": "撤销挂单",
+		"backOrderTitleConfirm": "确认撤单吗?撤单后数据不可恢复",
+		"backOrderSuccess": "撤单成功"
 	},
 
 	"pages" : {
diff --git a/pages/index/center2.vue b/pages/index/center2.vue
index be594a1..f87631a 100644
--- a/pages/index/center2.vue
+++ b/pages/index/center2.vue
@@ -12,10 +12,10 @@
         </view>
         <view class="info">
           <view class="name">
-            倾心.
+            {{userInfo.nickName}}
           </view>
           <view class="tips">
-            {{ $t('components.phoneNumber') }}：13812345678
+            {{ $t('components.phoneNumber') }}： {{userInfo.phone}}
           </view>
         </view>
         <view class="headBtn" @click="headBtn">
diff --git a/pages/index/tradingPlatform.vue b/pages/index/tradingPlatform.vue
index 8d7ef1e..cf544b5 100644
--- a/pages/index/tradingPlatform.vue
+++ b/pages/index/tradingPlatform.vue
@@ -20,20 +20,16 @@
 				</view>
 
 				<view class="supplierList">
-					<orderList :orderList="list" />
+					<orderList :list="list" />
 				</view>
 			</view>
 
 			<!-- 采购商 -->
 			<view class="purchaser" v-else>
+        <!--切换现货/期货-->
 				<view style="" class="purchaser-title">
-					<span @click="actionIndexChange(index)"
-					v-for="(item, index) in type"
-						:class="actionIndex == index ? 'active' : 'noactive'">{{ item.name }}</span>
-					<!-- <span @click="actionIndexChange(index)"
-						:class="actionIndex==index?'active':'noactive'">{{ $t('other.futuresTrading') }}</span> -->
+					<span @click="actionIndexChange(index)" v-for="(item, index) in type" :class="actionIndex == index ? 'active' : 'noactive'">{{ item.name }}</span>
 				</view>
-
 				<view class="productList">
 					<productList :list="list" />
 				</view>
@@ -79,9 +75,12 @@
 		},
 		onLoad() {
 			if(this.userShop){
-				this.mixinsListApi = 'getMyProductlist'
+        // 现货/期货列表
+				this.mixinsListApi = 'productList'
 			}else{
+        // 交易平台挂单列表
 				this.mixinsListApi = 'productlist'
+
 				this.queryParams.productType = this.actionIndex
 			}
 		},
diff --git a/pages_order/auth/registerShop.vue b/pages_order/auth/registerShop.vue
index 7004a5c..e11da40 100644
--- a/pages_order/auth/registerShop.vue
+++ b/pages_order/auth/registerShop.vue
@@ -41,23 +41,24 @@
             <input v-model="form.address" :placeholder="$t('other.enterCompanyAddress')" clearable></input>
           </view>
         </view>
-        <!--dian-->
+        <!--联系电话-->
         <view class="item">
           <view>{{ $t('components.lxPhone')}}</view>
           <view>
             <input v-model="form.phone" :placeholder="$t('components.plePhoneNumber')" clearable></input>
           </view>
         </view>
+        <!---->
         <view class="item">
           <view>{{ $t('other.companyAccount')}}</view>
           <view>
-            <input v-model="form.address" :placeholder="$t('other.enterCompanyAccount')" clearable></input>
+            <input v-model="form.bankAccount" :placeholder="$t('other.enterCompanyAccount')" clearable></input>
           </view>
         </view>
         <view class="item">
           <view>{{ $t('components.bankName')}}</view>
           <view>
-            <input v-model="form.address" :placeholder="$t('components.enterBankName')" clearable></input>
+            <input v-model="form.bankNama" :placeholder="$t('components.enterBankName')" clearable></input>
           </view>
         </view>
       </view>
@@ -129,29 +130,38 @@
 
     <view class="bottom">
       <view class="btns">
+        <!--申请审核-->
         <span @click="applyReview" class="sqsh">
           {{ $t('components.submitReview') }}
         </span>
+        <!--联系我们-->
         <span @click="contactUs" class="lxwm">
           {{ $t('components.contactUs') }}
         </span>
       </view>
       <view class="others">
+        <!--注册须知-->
         <span @click="applyReview" class="zcxz">
           {{ $t('components.registrationNotice') }}
         </span>
+        <!--框架合同预览-->
         <span @click="contactUs" class="kjhtyl">
           {{ $t('other.frameworkContractPreview') }}
         </span>
       </view>
     </view>
+    <!-- 联系客服弹框 -->
+    <customerServicePopup ref="customerServicePopup" />
 
   </view>
 </template>
 
 
 <script>
+import customerServicePopup from "@/components/config/customerServicePopup.vue";
+
 export default {
+  components: {customerServicePopup},
   onLoad(option) {
     this.titleIndex = option.identity
   },
@@ -166,13 +176,13 @@ export default {
       ],
       form: {
         "address": "",
+        "auditStatus": 0,
         "bankAccount": "",
         "bankInfo": "",
         "bankNama": "",
         "basicAccount": "",
         "businessLicense": "",
         "companyName": "",
-        "id": "",
         "password": "",
         "phone": "",
         "role": 0,
@@ -187,7 +197,7 @@ export default {
   methods: {
     // 申请审核
     applyReview() {
-      this.$api('loginLogout', res => {
+      this.$api('roleOption',this.form, res => {
         if (res.code == 200) {
           uni.removeStorageSync('token')
           this.$store.state.userInfo = {}
@@ -199,7 +209,8 @@ export default {
     },
     // 联系我们
     contactUs() {
-
+      console.log("打开客服弹框")
+      this.$refs.customerServicePopup.open();
     },
 
 
diff --git a/pages_order/auth/selectionIdentity.vue b/pages_order/auth/selectionIdentity.vue
index 6898185..f95086a 100644
--- a/pages_order/auth/selectionIdentity.vue
+++ b/pages_order/auth/selectionIdentity.vue
@@ -1,93 +1,100 @@
 <template>
-	<view>
+  <view>
 
-		<navbar :title="$t('pageTitle.selectIdentity')" 
-		:leftClick="!$route.query.back" @leftClick="$utils.navigateBack" />
+    <navbar :title="$t('pageTitle.selectIdentity')"
+            :leftClick="!$route.query.back" @leftClick="$utils.navigateBack"/>
 
-		<view class="container">
+    <view class="container">
 
-			<view class="title">{{ $t('components.selectIdentity') }}</view>
-			<view class="button-group">
-				<!--供应商-->
-				<view class="identity-button" @click="selectIdentity(0)">
-					<view class="identity-text"> {{ $t('other.iAmBuyer') }}</view>
-					<view class="identity-icon">
-						<img src="../../static/image/index/5.png" style="width: 100%; height: 100%;">
-					</view>
-				</view>
-				<!--采购-->
-				<view class="identity-button" @click="selectIdentity(1)">
-					<view class="identity-text"> {{ $t('other.iAmSupplier') }}</view>
-					<view class="identity-icon">
-						<img src="../../static/image/index/6.png" style="width: 100%; height: 100%;">
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
+      <view class="title">{{ $t('components.selectIdentity') }}</view>
+      <view class="button-group">
+        <!--供应商-->
+        <view class="identity-button" @click="selectIdentity(0)">
+          <view class="identity-text"> {{ $t('other.iAmBuyer') }}</view>
+          <view class="identity-icon">
+            <img src="../../static/image/index/5.png" style="width: 100%; height: 100%;">
+          </view>
+        </view>
+        <!--采购-->
+        <view class="identity-button" @click="selectIdentity(1)">
+          <view class="identity-text"> {{ $t('other.iAmSupplier') }}</view>
+          <view class="identity-icon">
+            <img src="../../static/image/index/6.png" style="width: 100%; height: 100%;">
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
 
 </template>
 
 <script>
-	export default {
-		methods: {
-			selectIdentity(identity) {
-				uni.navigateTo({
-					url: `/pages_order/auth/registerShop?identity=${identity}`
-				})
-			},
-		}
-	}
+import {mapGetters} from 'vuex'
+
+export default {
+  computed: {
+    ...mapGetters(['userShop', "userInfo"]),
+  },
+  methods: {
+    selectIdentity(identity) {
+      // if (userInfo)
+
+      uni.navigateTo({
+        url: `/pages_order/auth/registerShop?identity=${identity}`
+      })
+    },
+  }
+}
 </script>
 
 <style scoped lang="scss">
-	* {
-		box-sizing: border-box;
-	}
+* {
+  box-sizing: border-box;
+}
 
-	.container {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		//height: 100vh;
-		background-color: #f5f5f5;
+.container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  //height: 100vh;
+  background-color: #f5f5f5;
 
-		.title {
-			font-size: 40rpx;
-			color: #333;
-			margin: 80rpx 0;
-		}
+  .title {
+    font-size: 40rpx;
+    color: #333;
+    margin: 80rpx 0;
+  }
 
-		.button-group {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			justify-content: center;
+  .button-group {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
 
-			width: 100vw;
-			//padding: 0 20px;
+    width: 100vw;
+    //padding: 0 20px;
 
-			.identity-button {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				width: 80%;
-				margin-bottom: 40rpx;
-				padding: 40rpx 50rpx;
-				background-color: #2d2f59;
-				border-radius: 20rpx;
-				color: white;
+    .identity-button {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      width: 80%;
+      margin-bottom: 40rpx;
+      padding: 40rpx 50rpx;
+      background-color: #2d2f59;
+      border-radius: 20rpx;
+      color: white;
 
-				.identity-text {
-					font-size: 40rpx;
-				}
+      .identity-text {
+        font-size: 40rpx;
+      }
 
-				.identity-icon {
-					width: 130rpx;
-					height: 130rpx;
-				}
-			}
-		}
-	}
+      .identity-icon {
+        width: 130rpx;
+        height: 130rpx;
+      }
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/pages_order/center/addressListManage.vue b/pages_order/center/addressListManage.vue
index 953c383..e9d8ea4 100644
--- a/pages_order/center/addressListManage.vue
+++ b/pages_order/center/addressListManage.vue
@@ -123,11 +123,10 @@ export default {
 
     //删除地址
     deleteAddress(id) {
-      console.log("==========")
       let self = this
       uni.showModal({
-        title: '删除地址',
-        content: '确认删除此地址?删除后数据不可恢复',
+        title: this.$t('components.deleteAddress'),
+        content: this.$t('components.confirmDeleteAddress'),
         success(e) {
           if(e.confirm){
             self.$api('deleteAddress', {
@@ -135,7 +134,7 @@ export default {
             }, res => {
               if (res.code == 200) {
                 uni.showToast({
-                  title: '删除成功',
+                  title: this.$t('components.deleteSuccessful'),
                   icon: 'none'
                 })
                 self.getAddressList()
diff --git a/pages_order/components/address/addressList.vue b/pages_order/components/address/addressList.vue
index feaf50d..8a4beb4 100644
--- a/pages_order/components/address/addressList.vue
+++ b/pages_order/components/address/addressList.vue
@@ -114,7 +114,7 @@ export default {
     },
     // 删除地址
     deleteAddress(e){
-      console.log(e,"$emitdeleteAddress")
+
       this.$emit('deleteAddress', e)
     },
     // 修改地址
diff --git a/pages_order/components/order/orderList.vue b/pages_order/components/order/orderList.vue
index b85bd19..d04a1fc 100644
--- a/pages_order/components/order/orderList.vue
+++ b/pages_order/components/order/orderList.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="page">
-    <view class="item" v-for="(item, index) in orderList" :key="index">
+    <view v-if="list.length>0" class="item" v-for="(item, index) in list" :key="index">
       <view class="top">
         <view class="service">
           <text>{{ $t('other.aluminumProducts') }}</text>
@@ -40,12 +40,23 @@
 
       </view>
 
+      <!--撤单按钮-->
       <view class="bottom" v-if="showBackOrder">
-        <view @click="backOrder" class="btn">
+        <view @click="backOrder(item.id)" class="btn">
             {{ $t('other.withdrawOrder') }}
         </view>
       </view>
     </view>
+
+    <!--无历史记录-->
+    <view
+        style="padding: 100rpx 0;"
+        v-else>
+      <uv-empty
+          mode="history"
+          textSize="28rpx"
+          iconSize="100rpx"/>
+  </view>
   </view>
 </template>
 
@@ -53,7 +64,7 @@
 export default {
   name: "orderList",
   props: {
-    orderList: {
+    list: {
       type: Array,
       default: false
     },
@@ -78,7 +89,25 @@ export default {
     },
 
     // 撤单
-    backOrder() {
+    backOrder(id) {
+      let self = this
+      uni.showModal({
+        title: this.$t('other.backOrderTitle'),
+        content: this.$t('other.backOrderTitleConfirm'),
+        success(e) {
+          if(e.confirm){
+            self.$api('noShow', {id}, res => {
+              if (res.code == 200) {
+                uni.showToast({
+                  title: this.$t('other.backOrderSuccess'),
+                  icon: 'none'
+                })
+                self.getAddressList()
+              }
+            })
+          }
+        }
+      })
       uni.navigateTo({
         url: `/pages_order/order/backOrder?id=1`
       })
@@ -94,6 +123,9 @@ export default {
   flex-direction: column;
   gap: 20rpx;
 
+  height: calc(90vh - 180rpx);
+
+
   .item {
 
     padding: 20rpx;
diff --git a/pages_order/order/pendingOrder.vue b/pages_order/order/pendingOrder.vue
index 3daaa4f..dd2f136 100644
--- a/pages_order/order/pendingOrder.vue
+++ b/pages_order/order/pendingOrder.vue
@@ -7,7 +7,7 @@
     <view class="frame">
 
       <view class="content">
-        <orderList :orderList="list" :show-back-order="true"></orderList>
+        <orderList :list="list" :show-back-order="true"></orderList>
       </view>
     </view>
 
diff --git a/pages_order/tradingPlatform/nowOrder.vue b/pages_order/tradingPlatform/nowOrder.vue
index 32015f0..b6cc732 100644
--- a/pages_order/tradingPlatform/nowOrder.vue
+++ b/pages_order/tradingPlatform/nowOrder.vue
@@ -14,7 +14,7 @@
 				<view class="item">
 					<view>{{ $t('components.productSpe') }}</view>
 					<view>
-						铝制品(Al>96%)
+						{{$t('other.aluminumProducts')  }}
 					</view>
 				</view>
 
@@ -50,9 +50,9 @@
 					<view class="value">
 						<view class="dateTimeCls">
 							<view class="date" @click="startDateOpen">
-								{{ form.deliveryDate }}
-								<uv-datetime-picker ref="startDateRef" 
-								v-model="form.deliveryDate" 
+								{{ form.takeTime }}
+								<uv-datetime-picker ref="startDateRef"
+								v-model="form.takeTime"
 								mode="date"
 								@confirm="startDateChange"></uv-datetime-picker>
 							</view>
@@ -69,9 +69,9 @@
 				<view class="tentativeQuantity">
 					<view class="key">{{ $t('other.tentativeQuantity') }}</view>
 					<view class="value">
-						<uv-number-box 
+						<uv-number-box @change="form.deposit = (fatherData.price * form.num * (0.02)).toFixed(2)"
 						inputWidth="200rpx"
-						v-model="form.tentativeQuantity" :max="fatherData.num"></uv-number-box>
+						v-model="form.num" :max="fatherData.num"></uv-number-box>
 					</view>
 				</view>
 
@@ -87,7 +87,7 @@
 				<view class="performanceBond">
 					<view class="key">{{ $t('other.performanceDeposit') }}</view>
 					<view class="value">
-						<input v-model="form.performanceBond" clearable></input>
+						<input v-model="form.deposit" clearable></input>
 					</view>
 				</view>
 
@@ -138,23 +138,22 @@
 				const fatherData = JSON.parse(decodeURIComponent(options.params));
 				console.log(fatherData, "fatherData==========")
 				this.fatherData = fatherData;
+        this.form.deposit = (fatherData.price * this.form.num * (0.02)).toFixed(2);
 			}
 		},
 		data() {
 			return {
 				fatherData: {},
 				form: {
-					currentRegion: '',
-					address: '',
-					tentativeQuantity: 0,
-					deliveryDate: dayjs(new Date()).format("YYYY-MM-DD"),
-					price: 0,
-					performanceBond: 0,
-					latitude: '',
-					longitude: '',
-				},
-				phoneNumber: '00000000000'
-
+          "address": "",
+          "addressId": "",
+          "deposit": 0,
+          "id": "",
+          "num": 1,
+          "price": 0,
+          "productId": "",
+          "takeTime": ""
+        },
 			}
 		},
 		methods: {
@@ -173,7 +172,7 @@
 
 			startDateChange(val) {
 				this.$nextTick(() => {
-					this.form.deliveryDate = dayjs(val.value).format("YYYY-MM-DD")
+					this.form.takeTime = dayjs(val.value).format("YYYY-MM-DD")
 				});
 			},
 			startDateOpen() {
diff --git a/store/store.js b/store/store.js
index ca0dbee..7b1fe6e 100644
--- a/store/store.js
+++ b/store/store.js
@@ -18,7 +18,11 @@ const store = new Vuex.Store({
 		// 角色 true 为供应商 false 为采购商
 		userShop(state){
 			return state.shop
-		}
+		},
+		userInfo(state){
+			return state.userInfo
+		},
+
 	},
 	mutations: {
 		// 初始化配置
@@ -50,7 +54,6 @@ const store = new Vuex.Store({
 				if(res.code != 200){
 					return
 				}
-
 				state.userInfo = res.result.userInfo
 				state.buy = res.result.buy
 				state.shop = res.result.shop