对接支付

api/api.js

@@ -7,17 +7,17 @@ const config = {
 	// limit : 1000
 	// },
 	
-	getConfig : {url : '/api/getConfig', method : 'GET', limit : 500},
+	getConfig : {url : '/api/getConfig', method : 'GET'},
 	// 登录接口
-	loginLogin: { url: '/cheer/login/login', method: 'GET', },
+	loginLogin: { url: '/pay-api/login/login', method: 'GET', limit : 500},
 	//获取商品信息
-	getPayShopOne : {url : '/pay-api/info/getPayShopOne', method : 'GET', limit : 500},
+	getPayShopOne : {url : '/pay-api/info/getPayShopOne', method : 'GET'},
 	//创建支付订单
-	createPayOrder : {url : '/pay-api/info/createPayOrder', method : 'GET', limit : 500},
+	createPayOrder : {url : '/pay-api/info/createPayOrder', method : 'POST', limit : 2000},
 	//获取个人信息
-	getInfo : {url : '/pay-api/info/getInfo', method : 'GET', limit : 500},
+	getInfo : {url : '/pay-api/info/getInfo', method : 'GET'},
 	//获取订单列表
-	getPayOrderPage : {url : '/pay-api/info/getPayOrderPage', method : 'GET', limit : 500},
+	getPayOrderPage : {url : '/pay-api/info/getPayOrderPage', method : 'GET'},
 	//修改个人信息
 	updateInfo : {url : '/pay-api/info/updateInfo', method : 'GET', limit : 500},
 }

config.js

@@ -10,10 +10,11 @@ const type = 'dev'
 // 环境配置
 const config = {
 	dev : {
-		baseUrl : 'http://noticeadmin.augcl.com/a-notice-api/',
+		// baseUrl : 'http://noticeadmin.augcl.com/a-notice-api',
+		baseUrl : 'http://h5.xzaiyp.top/a-notice-api',
 	},
 	prod : {
-		baseUrl : 'http://xxx.xxx.xxx/xxx',
+		baseUrl : 'http://admin.anqi.shop/a-notice-api',
 	}
 }
 

pages.json

@@ -15,7 +15,8 @@
 		{
 			"path": "pages/login/login",
 			"style": {
-				"navigationBarTitleText": "登录"
+				"navigationBarTitleText": "登录",
+				"navigationStyle": "custom"
 			}
 		}
 	],

pages/center/center.vue

@@ -10,7 +10,9 @@
 							{{ userInfo.nickName }}
 						</view>
 					</view>
-					<view class="u-top" v-else>
+					<view class="u-top" 
+					v-else
+					@click="$utils.navigateTo('/login/login')">
 						<image class="img"
 							src="https://img2.baidu.com/it/u=2953585264,744730101&fm=253&fmt=auto&app=138&f=JPEG?w=360&h=360"
 							mode="widthFix"></image>
@@ -64,25 +66,29 @@
 					pageNo: 1,
 					pageSize: 10
 				},
-				orderList: []
+				orderList: [],
+				total : 0
 			}
 		},
 		onShow() {
-			// if (uni.getStorageSync('token')) {
-			// 	this.$store.commit('getUserInfo')
-			// }
-			// this.getOrderList()
+			if (uni.getStorageSync('token')) {
+				this.$store.commit('getUserInfo')
+				this.getOrderList()
+			}
 		},
 		//滚动到屏幕底部
 		onReachBottom() {
-			this.queryParams.pageSize += 10
-			this.getOrderList()
+			if(this.queryParams.pageSize < this.total){
+				this.queryParams.pageSize += 10
+				this.getOrderList()
+			}
 		},
 		methods: {
 			//获取订单列表
 			getOrderList() {
-				this.$api('getOrderWaterPage', this.queryParams, res => {
+				this.$api('getPayOrderPage', this.queryParams, res => {
 					this.orderList = res.result.records
+					this.total = res.result.total
 				})
 			},
 		}

pages/contentDetail/contentDetail.vue

@@ -101,13 +101,32 @@
 
 			//创建订单、支付
 			createPayOrder() {
-				// if (this.$refs.login.checkLogin()) {
-				// 	return
-				// }
 
 				this.registerForm.shopId = this.shopInfo.id
 				this.$api('createPayOrder', this.registerForm, res => {
-					console.log(res);
+					if(res.code == 200){
+						uni.requestPayment({
+							provider: 'wxpay', // 服务提提供商
+							timeStamp: res.result.timeStamp, // 时间戳
+							nonceStr: res.result.nonceStr, // 随机字符串
+							package: res.result.packageValue,
+							signType: res.result.signType, // 签名算法
+							paySign: res.result.paySign, // 签名
+							success: function (res) {
+								console.log('支付成功',res);
+								uni.switchTab({
+									url: '/pages/center/center'
+								})
+							},
+							fail: function (err) {
+								console.log('支付失败',err);
+								uni.showToast({
+									icon:'none',
+									title:"支付失败"
+								})
+							}
+						});
+					}
 				})
 			}
 

store/store.js

@@ -72,7 +72,7 @@ const store = new Vuex.Store({
 			})
 		},
 		getUserInfo(state) {
-			api('infoGetInfo', res => {
+			api('getInfo', res => {
 				if(res.code == 200){
 					state.userInfo = res.result
 				}