fix

pages/order/order.vue

@@ -101,7 +101,7 @@
 							    <text>更改地址</text>
 							  </view>
 							</view>
-							<view class="flex-row" v-else-if="item.status == 3">
+							<view class="flex-row" v-else-if="item.grading_finish == 1">
 							  <view class="flex-col items-center text-wrapper_1" style="border-color: #EA2B2B; color: #EA2B2B;" @click.stop="orderPay(item)">
 							    <text>付款</text>
 							  </view>

pages/write/distribution.vue

@@ -36,7 +36,7 @@
 				<view class="justify-between">
 				  <view class="flex-row">
 				    <text class="text_6">快递公司：</text>
-				    <text class="text_7">{{ expressIndex !== '' ? expressList[expressIndex].label : '请选择快递公司' }}</text>
+				    <text class="text_7">{{expressList[expressIndex].label}}</text>
 				  </view>
 				  <image
 				    src="@/static/icon/rightArrow.png"
@@ -89,6 +89,7 @@
 
 <script>
 	import { addGrading } from '@/service/grading.js';
+	import { sendAddr } from '@/service/address.js';
 	import logistics from './logistics.json';
 	
   export default {
@@ -96,12 +97,12 @@
       return {
 		  oddNumber: '',
 		  expressList: logistics,
-		  expressIndex: '',
+		  expressIndex: 0,
 		  baseInfoCache: {},
 		  sendAddress: {
-			  name: '评分卡部',
-			  tel: '18268905349',
-			  address: '北京北京市西城区5号设计总院A座203室'
+			  name: '...',
+			  tel: '...',
+			  address: '...'
 		  }
 	  };
     },
@@ -109,6 +110,9 @@
 		if(this.$valueType(options.base_data) !== 'undefined'){
 			this.baseInfoCache = JSON.parse(decodeURIComponent(options.base_data));
 		}
+		sendAddr().then((res) => {
+			this.sendAddress = res.data.datas;
+		});
 	},
 	methods: {
 		setClipboardData(){

pages/write/logistics.json

@@ -1,4 +1,6 @@
 [{
+	"label": "顺丰快递"
+},{
 	"label": "百世快递"
 },{
 	"label": "德邦快递"
@@ -6,8 +8,6 @@
 	"label": "丹鸟"
 },{
 	"label": "京东快递"
-},{
-	"label": "顺丰快递"
 },{
 	"label": "圆通快递"
 },{

service/address.js

@@ -14,7 +14,14 @@ export async function addNewAddress(data){
 		url: '/api/v1/new_addr',
 		method: 'post',
 		data
-	})
+	});
+}
+
+export  async function sendAddr(){
+	return await request({
+		url:'/api/v1/send_address',
+		method:'post'
+	});
 }
 
 // 根据地址id查询详细地址