Merge branch 'master' of https://git.yuzhankeji.cn/TmOct5/ZhHealth into master

apis/interfaces/pay.js

@@ -0,0 +1,33 @@
+/**
+ * Web唐明明
+ * 匆匆数载恍如梦，岁月迢迢华发增。
+ * 碌碌无为枉半生，一朝惊醒万事空。
+ * moduleName: 支付
+ */
+
+import { request } from '../index'
+
+const wxPAY = (orderNo) => {
+	console.log(orderNo)
+	return request({
+		url: 'mall/pay/' + orderNo + '/wechat',
+		data: {
+			type: 'app'
+		}
+	})
+}
+
+const alPAY = (orderNo) => {
+	console.log(orderNo)
+	return request({
+		url: 'mall/pay/' + orderNo + '/alipay',
+		data: {
+			type: 'app'
+		}
+	})
+}
+
+export {
+	wxPAY,
+	alPAY
+}

manifest.json

@@ -18,27 +18,30 @@
         },
         /* 模块配置 */
         "modules" : {
-            "OAuth" : {}
+            "OAuth" : {},
+            "Payment" : {},
+            "Share" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
             "android" : {
                 "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]
             },
@@ -48,7 +51,19 @@
             "sdkConfigs" : {
                 "oauth" : {
                     "univerify" : {}
+                },
+                "payment" : {
+                    "weixin" : {
+                        "__platform__" : [ "android" ],
+                        "appid" : "wxb7e3c263a2a37ab9",
+                        "UniversalLinks" : ""
+                    },
+                    "alipay" : {
+                        "__platform__" : [ "android" ]
                     }
+                },
+                "share" : {},
+                "ad" : {}
             }
         }
     },

pages/pay/pay.vue

@@ -1,26 +1,91 @@
 <template>
 	<view>
 		<oct-pay
-			price="100.00"
+			:price="price"
-			payNo="2021321649127837218918231"
+			:payNo="payNo"
 			color="#34CE98"
 			price-color="#e6576b"
-			:payPlatform="['alipay', 'wxpay']"
+			:payPlatform="platform"
 			@onPay="pay"
 		/>
 	</view>
 </template>
 
 <script>
+	import { wxPAY, alPAY } from '@/apis/interfaces/pay'
 	export default {
 		data() {
 			return {
-				
+				payNo	: "",
+				price	: "",
+				platform: ['wxpay', 'alipay']
 			}
 		},
+		mounted() {
+			this.payNo = this.$Route.query.orderNo
+			this.price = Number(this.$Route.query.price).toFixed(2)
+		},
 		methods: {
 			pay(e){
-				console.log("支付平台" + e.platform)
+				uni.getProvider({
+					service: 'payment',
+					success: res => {
+						if(res.provider.findIndex(val => val === e.platform) < 0){
+							switch (e.platform){
+								case 'wxpay':
+									uni.showToast({
+										title: '支付失败，您暂未安装微信',
+										icon : 'none'
+									})
+									break;
+								case 'alipay':
+									uni.showToast({
+										title: '支付失败，您暂未安装支付宝',
+										icon : 'none'
+									})
+									break;
+							}
+							return
+						}
+						if(e.platform === 'wxpay') this.getWXPAY(e.platform)
+						if(e.platform === 'alipay') this.getALPAY(e.platform)
+					}
+				})
+			},
+			getALPAY(payType){
+				alPAY(this.payNo).then(res => {
+					this.callPay(res, payType)
+				})
+			},
+			getWXPAY(payType){
+				wxPAY(this.payNo).then(res => {
+					let config = JSON.parse(res)
+					this.callPay(config, payType)
+				})
+			},
+			callPay(orderInfo, payType){
+				uni.requestPayment({
+					provider: payType,
+					orderInfo,
+					success: payRes => {
+						console.log(payRes)
+						
+					},
+					fail: payErr =>  {
+						console.log(payErr)
+						if(payErr.errCode == '-100'){
+							uni.showToast({
+								title: '支付被取消',
+								icon : 'none'
+							})
+						}else{
+							uni.showToast({
+								title: payErr.errMsg,
+								icon : 'none'
+							})
+						}
+					}
+				})
 			}
 		}
 	}

pages/store/buy.vue

@@ -75,7 +75,6 @@
 			if(JSON.stringify(this.$store.getters.getAddress) !== '{}') this.address = this.$store.getters.getAddress
 		},
 		mounted() {
-			console.log(this.$Route.query)
 			this.getBuy()
 		},
 		methods:{
@@ -107,10 +106,13 @@
 					address_id	: this.address.address_id,
 					remark		: this.remark || ''
 				}).then(res => {
-					console.log(res)
 					this.$store.commit('setAddress', {})
 					this.$Router.replace({
-						name: 'Pay'
+						name: 'Pay',
+						params: {
+							orderNo: res.order_no,
+							price  : res.total
+						}
 					})
 				})
 			}

pages/store/goods.vue

@@ -62,7 +62,6 @@
 		methods:{
 			getGoods(){
 				goods(this.$Route.query.id).then(res => {
-					console.log(res)
 					this.goods = res
 				})
 			},

public/userAuth.js

@@ -49,6 +49,11 @@ class userAuth {
 	}
 	// 预登录
 	Login() {
+		//#ifdef H5
+			router.push({ name: 'Auth' })
+			return
+		//#endif
+		
 		return new Promise((resolve, reject) => {
 			uni.showLoading({
 				title: '加载中',