去除token

components/mplogin/mplogin.vue

@@ -55,10 +55,6 @@
 			value: {
 				type: Boolean,
 				required: true
-			},
-			token: {
-				type: String,
-				default: ''
 			}
 		},
 		data() {
@@ -79,7 +75,7 @@
 					mask: true,
 				});
 
-				uploadFile(avatarUrl, this.token).then((res) => {
+				uploadFile(avatarUrl).then((res) => {
 					uni.hideLoading();
 					this.avatar = res.url;
 				}).catch(() => {

pages/login/login.vue

@@ -42,7 +42,7 @@
 			</view>
 		</view>
 		
-		<mplogin v-model="mpLoginPopup" :token="token" @close="mpLoginPopup = false" @update="handleSubmitInfo"/>
+		<mplogin v-model="mpLoginPopup" @close="mpLoginPopup = false" @update="handleSubmitInfo"/>
 		<mobile-login v-model="mobilePopup" @close="mobilePopup = false" @update="handleSubmitMobile"/>
 	</view>
 </template>
@@ -69,8 +69,7 @@
 				},
 				loginData: {},
 				mpLoginPopup: false,
-				mobilePopup: false,
+				mobilePopup: false
-				token: ''
 			}
 		},
 		
@@ -110,10 +109,7 @@
 				if (code == 1) {
 				    if (data.is_new_user) {
 				        uni.hideLoading()
-						this.token = data.token
+						this.mpLoginPopup = true
-						this.$nextTick(() => {
-							this.mpLoginPopup = true
-						})
 						this.loginData = data
 				    } else {
 				        this.loginHandle(data)

pages/order_now/order_now.vue

@@ -199,6 +199,8 @@
 
 <script>
 import { orderBuy, getOrderCoupon, getDelivery } from '@/api/order'
+import { prepay, getPayway } from '@/api/app'
+import { wxpay, alipay } from '@/utils/pay'
 export default {
 	data() {
 		return {
@@ -250,8 +252,18 @@ export default {
 		this.pay.alipay = 1
 		//#endif
 
-		// 配送方式
+		this.initDelivery()
-		getDelivery()
+	},
+
+	onUnload() {
+		// 取消全局监听
+		uni.$off(['selectaddress', 'store'])
+	},
+
+	methods: {
+		// 初始化配送方式
+		initDelivery(){
+			getDelivery()
 			.then(({ code, data, msg }) => {
 				// 请求结果判断
 				if (code != 1) throw new Error(msg)
@@ -306,14 +318,13 @@ export default {
 			.catch((err) => {
 				console.log(err)
 			})
-	},
+		},
 
-	onUnload() {
+		// 初始化支付方式
-		// 取消全局监听
+		initPay() {
-		uni.$off(['selectaddress', 'store'])
+
-	},
+		},
 
-	methods: {
 		appointmentTime() {
 			this.timePopup = true
 		},
@@ -422,7 +433,29 @@ export default {
 			})
 		},
 
+		// 订单提交
+        async handleOrderSubmit(from) {
+            this.showLoading = true
 
+            from.remark = this.userRemark
+
+            try {
+                const { code, data, msg } = await orderBuy(from)
+
+                if (code == 1) {
+                    uni.redirectTo({
+                        url: `/pages/payment/payment?from=${data.type}&order_id=${data.order_id}`
+                    })
+                } else {
+                    throw new Error(msg)
+                }
+            } catch (err) {
+                console.log(err)
+                // this.$toast({ title: '下单异常，请重新操作' })
+            } finally {
+                this.showLoading = false
+            }
+        },
 
 		// 订单处理
 		// handleOrderMethods(action) {

utils/tools.js

@@ -269,14 +269,14 @@ export function menuJump(item) {
 	}
 }
 
-export function uploadFile(path, token = '') {
+export function uploadFile(path) {
 	return new Promise((resolve, reject) => {
 		uni.uploadFile({
 			url: `${baseURL}/api/file/formimage`,
 			filePath: path,
 			name: "file",
 			header: {
-				token: store.getters.token || token,
+				token: store.getters.token,
 			},
 			fileType: "image",
 			cloudPath: "",