1

mer_uniapp/pages/rider_index/components/PriceChange/index.vue

@@ -124,9 +124,9 @@
 </template>
 <script>
 	import { string } from '../../../../plugin/clipboard/clipboard';
-import {
-		employeeAddressList,
-	} from '@/api/work.js'
+// import {
+// 		employeeAddressList,
+// 	} from '@/api/work.js'
 	export default {
 		name: "PriceChange",
 		components: {},
@@ -177,7 +177,7 @@ import {
 			},
 		},
 		created() {
-			this.getAddressList()
+			//this.getAddressList()
 		},
 		methods: {
 			inputChange(mark){
@@ -186,11 +186,11 @@ import {
 			radioChange: function(evt) {
 				this.addressId = evt.detail.value
 			},
-			getAddressList() {
-				employeeAddressList().then(res => {
-					this.addressList = res.data
-				})
-			},
+			// getAddressList() {
+			// 	employeeAddressList().then(res => {
+			// 		this.addressList = res.data
+			// 	})
+			// },
 			priceChange: function() {
 				this.focus = true;
 			},

mer_uniapp/pages/rider_index/order/index.vue

@@ -203,10 +203,16 @@
 
 <script>
 	// import UniDatetime from '../components/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue'
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	import {
+		mapGetters
+	} from "vuex";
 	import Loading from '../components/Loading/index'
 	import PriceChange from '../components/PriceChange/index.vue'
 	import footerPage from '../components/footerPage/index.vue'
-	import countDown from '@/components/countDown/index.vue'
+	
 	import emptyPage from '@/components/emptyPage.vue'
 	import baseMoney from '../components/BaseMoney.vue'
 	// #ifdef MP || APP-PLUS
@@ -219,12 +225,6 @@
 		HTTP_REQUEST_URL
 	} from '@/config/app';
 	import {
-		employeeOrderList,
-		employeeOrderMark,
-		employeeOrderInfo,
-		orderGetVerfication
-	} from '@/api/work.js';
-	import {
 		riderOrderAllList,riderOrderList,riderExpressOrderList,riderOrderReceiving,orderStatusNum,orderPickUp,orderComplete,orderCancel
 	} from '@/api/rider.js';
 	export default {
@@ -233,7 +233,6 @@
 			Loading,
 			PriceChange,
 			footerPage,
-			countDown,
 			emptyPage,
 			baseMoney,
 			// #ifdef MP || APP-PLUS
@@ -263,7 +262,7 @@
 				status: "",
 				state: 'all',
 				isRefund: 0, //1是仅退款;0是退货退款
-				imgHost: HTTP_REQUEST_URL,
+				//imgHost: HTTP_REQUEST_URL,
 				dateSelected: '1',
 				dateList: [{
 						label: '全部',
@@ -317,6 +316,7 @@
 				totalPage: '',
 			};
 		},
+		computed: mapGetters(['isLogin']),
 		onLoad(options) {
 			this.state = options.type ? options.type : 'await';
 			this.searchListData.status = options.type ? options.type : 'await';
@@ -327,9 +327,13 @@
 		// 	this.statusHeader()
 		// },
 		onShow() {
-			this.searchListData.page=1
-			this.getInitList()
-			this.statusHeader()
+			if (this.isLogin) {
+				this.searchListData.page=1
+				this.getInitList()
+				this.statusHeader()
+			} else {
+				toLogin();
+			}
 		},
 		methods: {
 			//订单表头数量
@@ -366,7 +370,6 @@
 			},
 			toDetail(item) {
 				uni.navigateTo({
-					//url: `/pages/rider_index/order/detail?orderNo=${item.orderNo}&deliveCharge=${item.deliveCharge}`
 					url: this.searchListData.type==1?`/pages/rider_index/express/detail?orderInfo=${JSON.stringify(item)}`:`/pages/rider_index/order/detail?orderInfo=${JSON.stringify(item)}`
 				})