对接H5支付

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) => {

pages/checkout/cashier/index.vue

@@ -44,11 +44,15 @@
 
         <!-- 支付确认弹窗 -->
         <!-- #ifdef H5 -->
-		<u-modal v-if="tempUnifyData" v-model="showConfirmModal" title="支付确认" show-cancel-button confirm-text="已完成支付"
+        <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>
+                <text>请在{{
+                        PayMethodClientNameEnum[tempUnifyData.method]
+                    }}内完成支付，如果您已经支付成功，请点击“已完成支付”按钮
+                </text>
             </view>
         </u-modal>
         <!-- #endif -->
@@ -74,6 +78,7 @@
     PayStatusEnum
 } from '@/common/enum/order'
 import * as CashierApi from '@/api/cashier'
+import {paymentAsH5} from "../../../core/payment/alipay";
 
 // 支付方式对应的图标
 const PayMethodIconEnum = {
@@ -228,7 +233,8 @@
             CashierApi.orderPay(app.orderId, {
                 method: app.curPaymentItem.method,
                 client: app.platform,
-						extra: app.getExtraAsUnify(app.curPaymentItem.method)
+                extra: app.getExtraAsUnify(app.curPaymentItem.method),
+                token: uni.getStorageSync('t_token')
             })
                 .then(result => app.onSubmitCallback(result))
                 .finally(err => {
@@ -259,7 +265,10 @@
             // 发起支付宝支付
             if (method === PayMethodEnum.ALIPAY.value) {
                 console.log('paymentData', JSON.stringify(paymentData))
-					Alipay.payment(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))
             }
@@ -276,7 +285,6 @@
                         })
 
 
-							
                     } else {
                         console.log(res, 'res')
                         app.$toast('非微信环境逻辑')
@@ -311,11 +319,6 @@
                 }, 500)
 
 
-
-
-
-
-
                 //       Wechat.payment({ orderKey: app.orderId, ...paymentData })
                 //         .then(res => app.onPaySuccess(res))
                 //         .catch(err => app.onPayFail(err))

pages/goods/list.vue

@@ -16,6 +16,9 @@
 				<view class="sort-item" :class="{ active: sortType === 'all' }" @click="handleSortType('all')">
 					<text>综合</text>
 				</view>
+				<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>
@@ -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

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)
 			}
 

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)