From 53d2c8276493db43facc1bed1bc7491cf8d9ab65 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Sat, 27 Jan 2024 05:15:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5H5=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/payment/alipay.js           |    2 +-
 pages/checkout/cashier/index.vue | 1085 +++++++++++++++---------------
 pages/goods/list.vue             |   16 +-
 pages/index/index.vue            |    4 +-
 pages/order/index.vue            |    5 +-
 5 files changed, 564 insertions(+), 548 deletions(-)

diff --git a/core/payment/alipay.js b/core/payment/alipay.js
index 9c45675..c9093c5 100644
--- a/core/payment/alipay.js
+++ b/core/payment/alipay.js
@@ -6,7 +6,7 @@ import { PayMethodEnum } from '@/common/enum/payment'
  * 发起支付请求 (用于H5)
  * @param {Object} option 参数
  */
-const paymentAsH5 = option => {
+export const paymentAsH5 = option => {
   const options = { formHtml: '', ...option }
   // 跳转到支付宝支付页
   return new Promise((resolve, reject) => {
diff --git a/pages/checkout/cashier/index.vue b/pages/checkout/cashier/index.vue
index da600d6..2e81145 100644
--- a/pages/checkout/cashier/index.vue
+++ b/pages/checkout/cashier/index.vue
@@ -1,551 +1,554 @@
 <template>
-	<view v-if="!isLoading" class="container" :style="appThemeStyle">
-		<!-- 订单信息 -->
-		<view class="order-info">
-			<!-- 支付剩余时间 -->
-			<view class="order-countdown">
-				<text class="m-r-6">剩余时间</text>
-				<count-down :date="order.expirationTime" separator="zh" theme="text" />
-			</view>
-			<!-- 付款金额 -->
-			<view class="order-amount">
-				<text class="unit">￥</text>
-				<text class="amount">{{ order.pay_price }}</text>
-			</view>
-		</view>
-
-		<!-- 支付方式 -->
-		<view class="payment-method">
-			<view v-for="(item, index) in methods" :key="index" class="pay-item dis-flex flex-x-between"
-				@click="handleSelectPayType(index)">
-				<view class="item-left dis-flex flex-y-center">
-					<view class="item-left_icon" :class="[item.method]">
-						<text class="iconfont" :class="[PayMethodIconEnum[item.method]]"></text>
-					</view>
-					<view class="item-left_text">
-						<text>{{ PayMethodEnum[item.method].name }}</text>
-					</view>
-					<view v-if="item.method === PayMethodEnum.BALANCE.value" class="user-balance">
-						<text>(可用￥{{ personal.balance }}元)</text>
-					</view>
-				</view>
-				<view class="item-right col-m" v-if="curPaymentItem && curPaymentItem.method == item.method">
-					<text class="iconfont icon-check"></text>
-				</view>
-			</view>
-		</view>
-
-		<!-- 确认按钮 -->
-		<view class="footer-fixed">
-			<view class="btn-wrapper">
-				<view class="btn-item btn-item-main" :class="{ disabled }" @click="handleSubmit()">确认支付</view>
-			</view>
-		</view>
-
-		<!-- 支付确认弹窗 -->
-		<!-- #ifdef H5 -->
-		<u-modal v-if="tempUnifyData" v-model="showConfirmModal" title="支付确认" show-cancel-button confirm-text="已完成支付"
-			:confirm-color="appTheme.mainBg" negative-top="100" :asyncClose="true"
-			@confirm="onTradeQuery(tempUnifyData.outTradeNo, tempUnifyData.method)">
-			<view class="modal-content">
-				<text>请在{{ PayMethodClientNameEnum[tempUnifyData.method] }}内完成支付，如果您已经支付成功，请点击“已完成支付”按钮</text>
-			</view>
-		</u-modal>
-		<!-- #endif -->
-	</view>
+    <view v-if="!isLoading" class="container" :style="appThemeStyle">
+        <!-- 订单信息 -->
+        <view class="order-info">
+            <!-- 支付剩余时间 -->
+            <view class="order-countdown">
+                <text class="m-r-6">剩余时间</text>
+                <count-down :date="order.expirationTime" separator="zh" theme="text"/>
+            </view>
+            <!-- 付款金额 -->
+            <view class="order-amount">
+                <text class="unit">￥</text>
+                <text class="amount">{{ order.pay_price }}</text>
+            </view>
+        </view>
+
+        <!-- 支付方式 -->
+        <view class="payment-method">
+            <view v-for="(item, index) in methods" :key="index" class="pay-item dis-flex flex-x-between"
+                  @click="handleSelectPayType(index)">
+                <view class="item-left dis-flex flex-y-center">
+                    <view class="item-left_icon" :class="[item.method]">
+                        <text class="iconfont" :class="[PayMethodIconEnum[item.method]]"></text>
+                    </view>
+                    <view class="item-left_text">
+                        <text>{{ PayMethodEnum[item.method].name }}</text>
+                    </view>
+                    <view v-if="item.method === PayMethodEnum.BALANCE.value" class="user-balance">
+                        <text>(可用￥{{ personal.balance }}元)</text>
+                    </view>
+                </view>
+                <view class="item-right col-m" v-if="curPaymentItem && curPaymentItem.method == item.method">
+                    <text class="iconfont icon-check"></text>
+                </view>
+            </view>
+        </view>
+
+        <!-- 确认按钮 -->
+        <view class="footer-fixed">
+            <view class="btn-wrapper">
+                <view class="btn-item btn-item-main" :class="{ disabled }" @click="handleSubmit()">确认支付</view>
+            </view>
+        </view>
+
+        <!-- 支付确认弹窗 -->
+        <!-- #ifdef H5 -->
+        <u-modal v-if="tempUnifyData" v-model="showConfirmModal" title="支付确认" show-cancel-button
+                 confirm-text="已完成支付"
+                 :confirm-color="appTheme.mainBg" negative-top="100" :asyncClose="true"
+                 @confirm="onTradeQuery(tempUnifyData.outTradeNo, tempUnifyData.method)">
+            <view class="modal-content">
+                <text>请在{{
+                        PayMethodClientNameEnum[tempUnifyData.method]
+                    }}内完成支付，如果您已经支付成功，请点击“已完成支付”按钮
+                </text>
+            </view>
+        </u-modal>
+        <!-- #endif -->
+    </view>
 </template>
 
 <script>
-	import wx from "weixin-js-sdk";
-	import storage from '@/utils/storage'
-	import {
-		inArray,
-		urlEncode
-	} from '@/utils/util'
-	import {
-		Alipay,
-		Wechat
-	} from '@/core/payment'
-	import CountDown from '@/components/countdown'
-	import {
-		PayMethodEnum
-	} from '@/common/enum/payment'
-	import {
-		PayStatusEnum
-	} from '@/common/enum/order'
-	import * as CashierApi from '@/api/cashier'
-
-	// 支付方式对应的图标
-	const PayMethodIconEnum = {
-		[PayMethodEnum.WECHAT.value]: 'icon-wechat-pay',
-		[PayMethodEnum.ALIPAY.value]: 'icon-alipay',
-		[PayMethodEnum.BALANCE.value]: 'icon-balance-pay'
-	}
-
-	// 支付方式的终端名称
-	const PayMethodClientNameEnum = {
-		[PayMethodEnum.WECHAT.value]: '微信',
-		[PayMethodEnum.ALIPAY.value]: '支付宝'
-	}
-
-	export default {
-		components: {
-			CountDown
-		},
-		data() {
-			return {
-				// 加载中
-				isLoading: true,
-				// 确认按钮禁用
-				disabled: false,
-				// 枚举类
-				PayMethodEnum,
-				PayMethodIconEnum,
-				PayMethodClientNameEnum,
-				// 当前选中的支付方式
-				curPaymentItem: null,
-				// 当前订单ID
-				orderId: null,
-				// 当前结算订单信息
-				order: {},
-				// 个人信息
-				personal: {
-					balance: '0.00'
-				},
-				// 当前客户端的支付方式列表（后端根据platform判断）
-				methods: [],
-				// 支付确认弹窗
-				showConfirmModal: false,
-				// #ifdef H5
-				// 当前微信支付信息 (临时数据, 仅用于H5端)
-				tempUnifyData: {
-					outTradeNo: '',
-					method: ''
-				},
-				// #endif
-			}
-		},
-
-		/**
-		 * 生命周期函数--监听页面加载
-		 */
-		onLoad({
-			orderId
-		}) {
-			// 记录订单ID
-			this.orderId = Number(orderId)
-			// 获取收银台信息
-			this.getCashierInfo()
-		},
-
-		methods: {
-
-			// 获取收银台信息
-			getCashierInfo() {
-				const app = this
-				app.isLoading = true
-				CashierApi.orderInfo(app.orderId, {
-						client: app.platform
-					})
-					.then(result => {
-						app.order = result.data.order
-						app.personal = result.data.personal
-						app.methods = result.data.paymentMethods
-						app.isLoading = false
-						app.setDefaultPayType()
-						app.checkOrderPayStatus()
-						// #ifdef H5
-						// 判断当前页面来源于浏览器返回
-						this.performance()
-						// #endif
-					})
-			},
-
-			// 设置默认的支付方式
-			setDefaultPayType() {
-				const app = this
-				if (app.disabled) return
-				const defaultIndex = app.methods.findIndex(item => item.is_default == true)
-				defaultIndex > -1 && app.handleSelectPayType(defaultIndex)
-			},
-
-			// 判断当前订单是否为已支付
-			checkOrderPayStatus() {
-				const app = this
-				if (app.order.pay_status == PayStatusEnum.SUCCESS.value) {
-					app.$toast('恭喜您，订单已付款成功')
-					app.onSuccessNav()
-				}
-			},
-
-			// 选择支付方式
-			handleSelectPayType(index) {
-				this.curPaymentItem = this.methods[index]
-			},
-
-			// 判断当前页面来源于浏览器返回
-			// #ifdef H5
-			performance() {
-				const app = this
-				// 判断订单状态, 异步回调会将订单状态变为已支付, 那么就不需要让用户手动查单了
-				if (app.order.pay_status == PayStatusEnum.PENDING.value) {
-					app.alipayPerformance()
-					app.wechatPerformance()
-				}
-			},
-
-			// H5端支付宝支付完成跳转回当前页面时触发
-			alipayPerformance() {
-				const app = this
-				app.tempUnifyData = Alipay.performance()
-				if (app.tempUnifyData) {
-					app.onTradeQuery(app.tempUnifyData.outTradeNo, app.tempUnifyData.method)
-				}
-			},
-
-			// H5端微信支付完成或返回时触发
-			wechatPerformance() {
-				const app = this
-				app.tempUnifyData = Wechat.performance(app.orderId)
-				if (app.tempUnifyData) {
-					app.showConfirmModal = true
-				}
-			},
-			// #endif
-
-			// 确认支付
-			handleSubmit() {
-				const app = this
-				// 判断是否选择了支付方式
-				if (!app.curPaymentItem) {
-					app.$toast('您还没有选择支付方式')
-					return
-				}
-				// 按钮禁用
-				if (app.disabled) return
-				app.disabled = true
-				// 提交到后端API
-				CashierApi.orderPay(app.orderId, {
-						method: app.curPaymentItem.method,
-						client: app.platform,
-						extra: app.getExtraAsUnify(app.curPaymentItem.method)
-					})
-					.then(result => app.onSubmitCallback(result))
-					.finally(err => {
-						setTimeout(() => app.disabled = false, 10)
-					})
-			},
-
-			// 获取第三方支付的扩展参数
-			getExtraAsUnify(method) {
-				if (method === PayMethodEnum.ALIPAY.value) {
-					return Alipay.extraAsUnify()
-				}
-				if (method === PayMethodEnum.WECHAT.value) {
-					return Wechat.extraAsUnify()
-				}
-				return {}
-			},
-
-			// 订单提交成功后回调
-			onSubmitCallback(result) {
-				const app = this
-				const method = app.curPaymentItem.method
-				const paymentData = result.data.payment
-				// 余额支付
-				if (method === PayMethodEnum.BALANCE.value) {
-					app.onShowSuccess(result)
-				}
-				// 发起支付宝支付
-				if (method === PayMethodEnum.ALIPAY.value) {
-					console.log('paymentData', JSON.stringify(paymentData))
-					Alipay.payment(paymentData)
-						.then(res => app.onPaySuccess(res))
-						.catch(err => app.onPayFail(err))
-				}
-				// 发起微信支付
-				if (method === PayMethodEnum.WECHAT.value) {
-					console.log('paymentData', paymentData)
-					wx.miniProgram.getEnv((res) => {
-						console.log('money',paymentData.pay_price)
-												console.log('order_no',paymentData.pay_price)
-						if (res.miniprogram) {
-							// 小程序环境下逻辑，跳转到小程序的扫描页面地址（/pages/dx-scan-code/scan-code，自己定义的地址）,可以带上页面返回时需要的参数
-							wx.miniProgram.navigateTo({
-								url: '/sub_pages/hdpay/hdpay?money='+paymentData.pay_price+'&orderNo='+paymentData.order_no
-							})
-							
-						
-							
-						} else {
-							console.log(res, 'res')
-							app.$toast('非微信环境逻辑')
-						}
-					})
-
-					return
-
-
-					wx.config({
-						debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
-						appId: paymentData.appId, // 必填，公众号的唯一标识
-						timeStamp: paymentData.timeStamp, // 必填，生成签名的时间戳
-						nonceStr: paymentData.nonceStr, // 必填，生成签名的随机串
-						signature: paymentData.paySign, // 必填，签名，见附录1
-						jsApiList: ['chooseWXPay']
-					})
-					setTimeout(() => {
-						WeixinJSBridge.invoke('getBrandWCPayRequest', {
-								"appId": paymentData.appId, //公众号ID，由商户传入     
-								"timeStamp": paymentData.timeStamp,
-								"nonceStr": paymentData.nonceStr, //随机串     
-								"package": paymentData.package,
-								"signType": "RSA", //微信签名方式：     
-								"paySign": paymentData.paySign //微信签名 
-							},
-							function(res) {
-								app.$toast('订单支付成功')
-								app.onSuccessNav()
-							});
-
-					}, 500)
-
-
-
-
-
-
-
-					//       Wechat.payment({ orderKey: app.orderId, ...paymentData })
-					//         .then(res => app.onPaySuccess(res))
-					//         .catch(err => app.onPayFail(err))
-
-
-				}
-			},
-
-			// 订单支付成功的回调方法
-			// 这里只是前端支付api返回结果success,实际订单是否支付成功 以后端的查单和异步通知为准
-			onPaySuccess({
-				res,
-				option: {
-					isRequireQuery,
-					outTradeNo,
-					method
-				}
-			}) {
-				const app = this
-				// 判断是否需要主动查单
-				// isRequireQuery为true代表需要主动查单
-				if (isRequireQuery) {
-					app.onTradeQuery(outTradeNo, method)
-					return true
-				}
-				this.onShowSuccess(res)
-			},
-
-			// 显示支付成功信息并页面跳转
-			onShowSuccess({
-				message
-			}) {
-				this.$toast(message || '订单支付成功')
-				this.onSuccessNav()
-			},
-
-			// 订单支付失败
-			onPayFail(err) {
-				console.log('onPayFail', err)
-				const errMsg = err.message || '订单未支付'
-				this.$error(errMsg)
-			},
-
-			// 已完成支付按钮事件: 请求后端查单
-			onTradeQuery(outTradeNo, method) {
-				const app = this
-				// 交易查询
-				// 查询第三方支付订单是否付款成功
-				CashierApi.tradeQuery({
-						outTradeNo,
-						method,
-						client: app.platform
-					})
-					.then(result => result.data.isPay ? app.onShowSuccess(result) : app.onPayFail(result))
-					.finally(() => app.showConfirmModal = false)
-			},
-
-			// 支付成功后的跳转
-			onSuccessNav() {
-
-				uni.reLaunch({
-					url: '/pages/order/index'
-				})
-				//       const pages = getCurrentPages()
-				//       const lastPage = pages.length < 2 ? null : pages[pages.length - 2]
-				//       const backRoutes = [
-				//         'pages/order/index',
-				//         'pages/order/detail'
-				//       ]
-
-				//       if (lastPage && inArray(lastPage.route, backRoutes)) {
-				//         setTimeout(() => {
-				//           uni.navigateBack()
-				//         }, 1000)
-				//       } else {
-				//         setTimeout(() => {
-				//           this.$navTo('pages/order/index', {}, 'redirectTo')
-				//         }, 1200)
-				//       }
-			},
-
-		}
-	}
+import wx from "weixin-js-sdk";
+import storage from '@/utils/storage'
+import {
+    inArray,
+    urlEncode
+} from '@/utils/util'
+import {
+    Alipay,
+    Wechat
+} from '@/core/payment'
+import CountDown from '@/components/countdown'
+import {
+    PayMethodEnum
+} from '@/common/enum/payment'
+import {
+    PayStatusEnum
+} from '@/common/enum/order'
+import * as CashierApi from '@/api/cashier'
+import {paymentAsH5} from "../../../core/payment/alipay";
+
+// 支付方式对应的图标
+const PayMethodIconEnum = {
+    [PayMethodEnum.WECHAT.value]: 'icon-wechat-pay',
+    [PayMethodEnum.ALIPAY.value]: 'icon-alipay',
+    [PayMethodEnum.BALANCE.value]: 'icon-balance-pay'
+}
+
+// 支付方式的终端名称
+const PayMethodClientNameEnum = {
+    [PayMethodEnum.WECHAT.value]: '微信',
+    [PayMethodEnum.ALIPAY.value]: '支付宝'
+}
+
+export default {
+    components: {
+        CountDown
+    },
+    data() {
+        return {
+            // 加载中
+            isLoading: true,
+            // 确认按钮禁用
+            disabled: false,
+            // 枚举类
+            PayMethodEnum,
+            PayMethodIconEnum,
+            PayMethodClientNameEnum,
+            // 当前选中的支付方式
+            curPaymentItem: null,
+            // 当前订单ID
+            orderId: null,
+            // 当前结算订单信息
+            order: {},
+            // 个人信息
+            personal: {
+                balance: '0.00'
+            },
+            // 当前客户端的支付方式列表（后端根据platform判断）
+            methods: [],
+            // 支付确认弹窗
+            showConfirmModal: false,
+            // #ifdef H5
+            // 当前微信支付信息 (临时数据, 仅用于H5端)
+            tempUnifyData: {
+                outTradeNo: '',
+                method: ''
+            },
+            // #endif
+        }
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad({
+               orderId
+           }) {
+        // 记录订单ID
+        this.orderId = Number(orderId)
+        // 获取收银台信息
+        this.getCashierInfo()
+    },
+
+    methods: {
+
+        // 获取收银台信息
+        getCashierInfo() {
+            const app = this
+            app.isLoading = true
+            CashierApi.orderInfo(app.orderId, {
+                client: app.platform
+            })
+                .then(result => {
+                    app.order = result.data.order
+                    app.personal = result.data.personal
+                    app.methods = result.data.paymentMethods
+                    app.isLoading = false
+                    app.setDefaultPayType()
+                    app.checkOrderPayStatus()
+                    // #ifdef H5
+                    // 判断当前页面来源于浏览器返回
+                    this.performance()
+                    // #endif
+                })
+        },
+
+        // 设置默认的支付方式
+        setDefaultPayType() {
+            const app = this
+            if (app.disabled) return
+            const defaultIndex = app.methods.findIndex(item => item.is_default == true)
+            defaultIndex > -1 && app.handleSelectPayType(defaultIndex)
+        },
+
+        // 判断当前订单是否为已支付
+        checkOrderPayStatus() {
+            const app = this
+            if (app.order.pay_status == PayStatusEnum.SUCCESS.value) {
+                app.$toast('恭喜您，订单已付款成功')
+                app.onSuccessNav()
+            }
+        },
+
+        // 选择支付方式
+        handleSelectPayType(index) {
+            this.curPaymentItem = this.methods[index]
+        },
+
+        // 判断当前页面来源于浏览器返回
+        // #ifdef H5
+        performance() {
+            const app = this
+            // 判断订单状态, 异步回调会将订单状态变为已支付, 那么就不需要让用户手动查单了
+            if (app.order.pay_status == PayStatusEnum.PENDING.value) {
+                app.alipayPerformance()
+                app.wechatPerformance()
+            }
+        },
+
+        // H5端支付宝支付完成跳转回当前页面时触发
+        alipayPerformance() {
+            const app = this
+            app.tempUnifyData = Alipay.performance()
+            if (app.tempUnifyData) {
+                app.onTradeQuery(app.tempUnifyData.outTradeNo, app.tempUnifyData.method)
+            }
+        },
+
+        // H5端微信支付完成或返回时触发
+        wechatPerformance() {
+            const app = this
+            app.tempUnifyData = Wechat.performance(app.orderId)
+            if (app.tempUnifyData) {
+                app.showConfirmModal = true
+            }
+        },
+        // #endif
+
+        // 确认支付
+        handleSubmit() {
+            const app = this
+            // 判断是否选择了支付方式
+            if (!app.curPaymentItem) {
+                app.$toast('您还没有选择支付方式')
+                return
+            }
+            // 按钮禁用
+            if (app.disabled) return
+            app.disabled = true
+            // 提交到后端API
+            CashierApi.orderPay(app.orderId, {
+                method: app.curPaymentItem.method,
+                client: app.platform,
+                extra: app.getExtraAsUnify(app.curPaymentItem.method),
+                token: uni.getStorageSync('t_token')
+            })
+                .then(result => app.onSubmitCallback(result))
+                .finally(err => {
+                    setTimeout(() => app.disabled = false, 10)
+                })
+        },
+
+        // 获取第三方支付的扩展参数
+        getExtraAsUnify(method) {
+            if (method === PayMethodEnum.ALIPAY.value) {
+                return Alipay.extraAsUnify()
+            }
+            if (method === PayMethodEnum.WECHAT.value) {
+                return Wechat.extraAsUnify()
+            }
+            return {}
+        },
+
+        // 订单提交成功后回调
+        onSubmitCallback(result) {
+            const app = this
+            const method = app.curPaymentItem.method
+            const paymentData = result.data.payment
+            // 余额支付
+            if (method === PayMethodEnum.BALANCE.value) {
+                app.onShowSuccess(result)
+            }
+            // 发起支付宝支付
+            if (method === PayMethodEnum.ALIPAY.value) {
+                console.log('paymentData', JSON.stringify(paymentData))
+                // Alipay.payment(paymentData)
+                // 	.then(res => app.onPaySuccess(res))
+                // 	.catch(err => app.onPayFail(err))
+                Alipay.paymentAsH5({formHtml: result.data.data})
+                    .then(res => app.onPaySuccess(res))
+                    .catch(err => app.onPayFail(err))
+            }
+            // 发起微信支付
+            if (method === PayMethodEnum.WECHAT.value) {
+                console.log('paymentData', paymentData)
+                wx.miniProgram.getEnv((res) => {
+                    console.log('money', paymentData.pay_price)
+                    console.log('order_no', paymentData.pay_price)
+                    if (res.miniprogram) {
+                        // 小程序环境下逻辑，跳转到小程序的扫描页面地址（/pages/dx-scan-code/scan-code，自己定义的地址）,可以带上页面返回时需要的参数
+                        wx.miniProgram.navigateTo({
+                            url: '/sub_pages/hdpay/hdpay?money=' + paymentData.pay_price + '&orderNo=' + paymentData.order_no
+                        })
+
+
+                    } else {
+                        console.log(res, 'res')
+                        app.$toast('非微信环境逻辑')
+                    }
+                })
+
+                return
+
+
+                wx.config({
+                    debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+                    appId: paymentData.appId, // 必填，公众号的唯一标识
+                    timeStamp: paymentData.timeStamp, // 必填，生成签名的时间戳
+                    nonceStr: paymentData.nonceStr, // 必填，生成签名的随机串
+                    signature: paymentData.paySign, // 必填，签名，见附录1
+                    jsApiList: ['chooseWXPay']
+                })
+                setTimeout(() => {
+                    WeixinJSBridge.invoke('getBrandWCPayRequest', {
+                            "appId": paymentData.appId, //公众号ID，由商户传入
+                            "timeStamp": paymentData.timeStamp,
+                            "nonceStr": paymentData.nonceStr, //随机串
+                            "package": paymentData.package,
+                            "signType": "RSA", //微信签名方式：
+                            "paySign": paymentData.paySign //微信签名
+                        },
+                        function (res) {
+                            app.$toast('订单支付成功')
+                            app.onSuccessNav()
+                        });
+
+                }, 500)
+
+
+                //       Wechat.payment({ orderKey: app.orderId, ...paymentData })
+                //         .then(res => app.onPaySuccess(res))
+                //         .catch(err => app.onPayFail(err))
+
+
+            }
+        },
+
+        // 订单支付成功的回调方法
+        // 这里只是前端支付api返回结果success,实际订单是否支付成功 以后端的查单和异步通知为准
+        onPaySuccess({
+                         res,
+                         option: {
+                             isRequireQuery,
+                             outTradeNo,
+                             method
+                         }
+                     }) {
+            const app = this
+            // 判断是否需要主动查单
+            // isRequireQuery为true代表需要主动查单
+            if (isRequireQuery) {
+                app.onTradeQuery(outTradeNo, method)
+                return true
+            }
+            this.onShowSuccess(res)
+        },
+
+        // 显示支付成功信息并页面跳转
+        onShowSuccess({
+                          message
+                      }) {
+            this.$toast(message || '订单支付成功')
+            this.onSuccessNav()
+        },
+
+        // 订单支付失败
+        onPayFail(err) {
+            console.log('onPayFail', err)
+            const errMsg = err.message || '订单未支付'
+            this.$error(errMsg)
+        },
+
+        // 已完成支付按钮事件: 请求后端查单
+        onTradeQuery(outTradeNo, method) {
+            const app = this
+            // 交易查询
+            // 查询第三方支付订单是否付款成功
+            CashierApi.tradeQuery({
+                outTradeNo,
+                method,
+                client: app.platform
+            })
+                .then(result => result.data.isPay ? app.onShowSuccess(result) : app.onPayFail(result))
+                .finally(() => app.showConfirmModal = false)
+        },
+
+        // 支付成功后的跳转
+        onSuccessNav() {
+
+            uni.reLaunch({
+                url: '/pages/order/index'
+            })
+            //       const pages = getCurrentPages()
+            //       const lastPage = pages.length < 2 ? null : pages[pages.length - 2]
+            //       const backRoutes = [
+            //         'pages/order/index',
+            //         'pages/order/detail'
+            //       ]
+
+            //       if (lastPage && inArray(lastPage.route, backRoutes)) {
+            //         setTimeout(() => {
+            //           uni.navigateBack()
+            //         }, 1000)
+            //       } else {
+            //         setTimeout(() => {
+            //           this.$navTo('pages/order/index', {}, 'redirectTo')
+            //         }, 1200)
+            //       }
+        },
+
+    }
+}
 </script>
 
 <style>
-	page {
-		background: #F4F4F4;
-	}
+page {
+    background: #F4F4F4;
+}
 </style>
 <style lang="scss" scoped>
-	.container {
-		background-color: #F4F4F4;
-	}
-
-	// 订单信息
-	.order-info {
-		padding: 80rpx 0;
-		text-align: center;
-
-		.order-countdown {
-			display: flex;
-			justify-content: center;
-			font-size: 26rpx;
-			color: #666666;
-			margin-bottom: 20rpx;
-		}
-
-		.order-amount {
-			margin: 0 auto;
-			max-width: 50%;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			color: #111111;
-
-			.unit {
-				font-size: 30rpx;
-				margin-bottom: -18rpx;
-			}
-
-			.amount {
-				font-size: 56rpx;
-			}
-		}
-	}
-
-	// 支付方式
-	.payment-method {
-		width: 94%;
-		margin: 0 auto 20rpx auto;
-		padding: 0 40rpx;
-		background-color: #ffffff;
-		border-radius: 20rpx;
-
-		.pay-item {
-			padding: 26rpx 0;
-			font-size: 28rpx;
-			border-bottom: 1rpx solid rgb(248, 248, 248);
-
-			&:last-child {
-				border-bottom: none;
-			}
-
-			.item-left_icon {
-				margin-right: 20rpx;
-				font-size: 44rpx;
-
-				&.wechat {
-					color: #00c800;
-				}
-
-				&.alipay {
-					color: #009fe8;
-				}
-
-				&.balance {
-					color: #ff9700;
-				}
-			}
-
-			.item-left_text {
-				font-size: 28rpx;
-			}
-
-			.item-right {
-				font-size: 32rpx;
-			}
-
-			.user-balance {
-				margin-left: 20rpx;
-				font-size: 26rpx;
-			}
-		}
-
-	}
-
-
-	// 支付确认弹窗
-	.modal-content {
-		padding: 40rpx 48rpx;
-		font-size: 30rpx;
-		line-height: 50rpx;
-		text-align: left;
-		color: #606266;
-		// height: 620rpx;
-		box-sizing: border-box;
-	}
-
-
-	// 底部操作栏
-	.footer-fixed {
-		position: fixed;
-		bottom: var(--window-bottom);
-		left: 0;
-		right: 0;
-		z-index: 11;
-		box-shadow: 0 -4rpx 40rpx 0 rgba(151, 151, 151, 0.24);
-		background: #fff;
-
-		// 设置ios刘海屏底部横线安全区域
-		padding-bottom: constant(safe-area-inset-bottom);
-		padding-bottom: env(safe-area-inset-bottom);
-
-		.btn-wrapper {
-			height: 120rpx;
-			display: flex;
-			align-items: center;
-			padding: 0 40rpx;
-		}
-
-		.btn-item {
-			flex: 1;
-			font-size: 28rpx;
-			height: 80rpx;
-			color: #fff;
-			border-radius: 50rpx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-
-		.btn-item-main {
-			background: linear-gradient(to right, $main-bg, $main-bg2);
-
-			// 禁用按钮
-			&.disabled {
-				opacity: 0.6;
-			}
-		}
-
-	}
+.container {
+    background-color: #F4F4F4;
+}
+
+// 订单信息
+.order-info {
+    padding: 80rpx 0;
+    text-align: center;
+
+    .order-countdown {
+        display: flex;
+        justify-content: center;
+        font-size: 26rpx;
+        color: #666666;
+        margin-bottom: 20rpx;
+    }
+
+    .order-amount {
+        margin: 0 auto;
+        max-width: 50%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: #111111;
+
+        .unit {
+            font-size: 30rpx;
+            margin-bottom: -18rpx;
+        }
+
+        .amount {
+            font-size: 56rpx;
+        }
+    }
+}
+
+// 支付方式
+.payment-method {
+    width: 94%;
+    margin: 0 auto 20rpx auto;
+    padding: 0 40rpx;
+    background-color: #ffffff;
+    border-radius: 20rpx;
+
+    .pay-item {
+        padding: 26rpx 0;
+        font-size: 28rpx;
+        border-bottom: 1rpx solid rgb(248, 248, 248);
+
+        &:last-child {
+            border-bottom: none;
+        }
+
+        .item-left_icon {
+            margin-right: 20rpx;
+            font-size: 44rpx;
+
+            &.wechat {
+                color: #00c800;
+            }
+
+            &.alipay {
+                color: #009fe8;
+            }
+
+            &.balance {
+                color: #ff9700;
+            }
+        }
+
+        .item-left_text {
+            font-size: 28rpx;
+        }
+
+        .item-right {
+            font-size: 32rpx;
+        }
+
+        .user-balance {
+            margin-left: 20rpx;
+            font-size: 26rpx;
+        }
+    }
+
+}
+
+
+// 支付确认弹窗
+.modal-content {
+    padding: 40rpx 48rpx;
+    font-size: 30rpx;
+    line-height: 50rpx;
+    text-align: left;
+    color: #606266;
+    // height: 620rpx;
+    box-sizing: border-box;
+}
+
+
+// 底部操作栏
+.footer-fixed {
+    position: fixed;
+    bottom: var(--window-bottom);
+    left: 0;
+    right: 0;
+    z-index: 11;
+    box-shadow: 0 -4rpx 40rpx 0 rgba(151, 151, 151, 0.24);
+    background: #fff;
+
+    // 设置ios刘海屏底部横线安全区域
+    padding-bottom: constant(safe-area-inset-bottom);
+    padding-bottom: env(safe-area-inset-bottom);
+
+    .btn-wrapper {
+        height: 120rpx;
+        display: flex;
+        align-items: center;
+        padding: 0 40rpx;
+    }
+
+    .btn-item {
+        flex: 1;
+        font-size: 28rpx;
+        height: 80rpx;
+        color: #fff;
+        border-radius: 50rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+
+    .btn-item-main {
+        background: linear-gradient(to right, $main-bg, $main-bg2);
+
+        // 禁用按钮
+        &.disabled {
+            opacity: 0.6;
+        }
+    }
+
+}
 </style>
\ No newline at end of file
diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index 3e8c6f5..eeb001b 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -16,7 +16,10 @@
 				<view class="sort-item" :class="{ active: sortType === 'all' }" @click="handleSortType('all')">
 					<text>综合</text>
 				</view>
-				<view class="sort-item" :class="{ active: sortType === 'sales' }" @click="handleSortType('sales')">
+				<view class="sort-item" :class="{ active: sortType === 'category' }" @click="changeCategory">
+					<text>{{ categoryText }}</text>
+				</view>
+                <view class="sort-item" :class="{ active: sortType === 'sales' }" @click="handleSortType('sales')">
 					<text>销量</text>
 				</view>
 				<view class="sort-item sort-item-price" :class="{ active: sortType === 'price' }"
@@ -128,7 +131,7 @@
 		</mescroll-body>
 	
 
-			
+
 	
 	</view>
 	
@@ -180,7 +183,10 @@
 					},
 					// 数量要大于4条才显示无更多数据
 					noMoreSize: 4,
-				}
+				},
+                mainCategoryId: 0, // 主分类id
+                categoryText: '全部分类',
+                childCategoryList: []
 			}
 		},
 
@@ -286,6 +292,10 @@
 				app.mescroll.resetUpScroll()
 			},
 
+            changeCategory(category){
+
+            },
+
 			// 切换列表显示方式
 			handleShowView() {
 				const app = this
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4d77245..6c47691 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -399,8 +399,8 @@
 					console.log('logut')
 				})
 
-				uni.getStorageSync('t_id', options.id)
-				uni.getStorageSync('t_token', options.token)
+				uni.setStorageSync('t_id', options.id)
+				uni.setStorageSync('t_token', options.token)
 				_this.getUserInfo(options.id, options.token)
 			}
 
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 6f3da77..5cfd726 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -401,7 +401,10 @@
 					content: '确认要取消该订单吗？',
 					success(o) {
 						if (o.confirm) {
-							OrderApi.cancel(orderId)
+							OrderApi.cancel(orderId, {
+                                token: uni.getStorageSync('t_token'),
+                                userId: uni.getStorageSync('t_id'),
+                            })
 								.then(result => {
 									// 显示成功信息
 									app.$toast(result.message)