feat: bug修复;

refactor(router): 重构H5路由处理逻辑
fix(share): 修复微信分享URL问题
feat(payment): 添加H5环境微信支付支持
style: 统一页面标题显示
docs: 更新页面配置文档

MP_verify_wfZF8R25IxLLUUXi.txt

@@ -0,0 +1 @@
+wfZF8R25IxLLUUXi

api/model/info.js

@@ -54,6 +54,28 @@ const api = {
 		limit: 1000,
 		showLoading: true,
 	},
+	// 钱包-提现
+	cashout: {
+		url: '/amount/cashout',
+		method: 'POST',
+		auth: true,
+		limit: 1000,
+		showLoading: true,
+	},
+	// 钱包-领取提现金额
+	getMoney: {
+		url: '/amount/getMoney',
+		method: 'POST',
+		auth: true,
+		limit: 1000,
+		showLoading: true,
+	},
+	// 钱包-提现记录列表
+	queryCashoutLog: {
+		url: '/amount/queryCashoutLog',
+		method: 'GET',
+		auth: true,
+	},
 	// 获取地址列表带分页
 	getAddressPageList: {
 		url: '/info_common/getAddressPageList',

api/model/login.js

@@ -5,8 +5,17 @@
 const api = {
 	// 微信登录接口
 	wxLogin: {
+		
+		// #ifdef H5
+		url: '/login/wxLogin',
+		method: 'POST', 
+		// #endif
+		
+		// #ifdef MP-WEIXIN
 		url: '/login/login',
 		method: 'GET', 
+		// #endif
+		
 		limit : 500,
 		showLoading : true,
 	},
@@ -36,6 +45,13 @@ const api = {
 		method: 'GET',
 		auth: true,
 	},
+	
+	//公众号签名
+	getVipShareSign : {
+		url: '/share/getVipShareSign',
+		method: 'GET',
+	},
+	
 }
 
 export default api

components/base/navbar.vue

@@ -1,6 +1,11 @@
 <template>
 <!-- 	<view class="navbar"
 	:style="{backgroundColor : bgColor}"> -->
+	
+	
+	
+	<!-- #ifdef MP-WEIXIN -->
+	
 		<view class="title nav-bar__view"
 		:style="{backgroundColor : bgColor,color}">
 			<view class="left">
@@ -40,6 +45,7 @@
 			</view>
 		</view>
 		
+	<!-- #endif -->
 	<!-- </view> -->
 </template>
 
@@ -76,15 +82,28 @@
 			}
 		},
 		created() {
+			if(typeof document != 'undefined'){
+				document.title = this.title
+			}
 		},
 		beforeDestroy() {
 		},
 		data() {
 			return {
-				length : getCurrentPages().length
+				length : this.getPageLength()
 			};
 		},
 		methods : {
+			getPageLength() {
+				try {
+					const pages = getCurrentPages();
+					return pages ? pages.length : 1;
+				} catch(e) {
+					// H5 环境下可能获取失败，默认返回 1
+					console.warn('获取页面栈长度失败:', e);
+					return 1;
+				}
+			},
 			toHome(){
 				if(this.length != 1){
 					return

components/couponList/couponList.vue

@@ -53,6 +53,11 @@
 				this.getCouponList()
 			}
 		},
+		// #ifndef H5
+		mounted() {
+			this.getCouponList()
+		},
+		// #endif
 		methods: {
 			select(item) {
 				this.$emit('select', item)

components/order/orderCard.vue

@@ -20,7 +20,7 @@
     </view>
     <view class="btns">
       <template v-if="!readonly">
-        <template v-if="data.status != 1">
+        <template v-if="data.status != 1 && data.status != 3">
           <button plain class="btn btn-plain" @click="onDelete">删除订单</button>
         </template>
         <!-- 待付款 -->

config.js

@@ -7,17 +7,21 @@ import uvUI from '@/uni_modules/uv-ui-tools'
 Vue.use(uvUI);
 
 // 当前环境
-const type = 'dev'
+const type = 'prod'
 
 
 // 环境配置
 const config = {
 	dev: {
 		baseUrl: 'http://augcl.natapp1.cc/massage-admin/massage',
+		// redirect : 'http://h5.xzaiyp.top',
+		redirect : 'https://wwwh5.yurangongfang.com/',
 	},
 	prod: {
 		baseUrl: 'https://www.yurangongfang.com/massage-admin/massage',
-	}
+		// baseUrl: 'https://www.yurangongfang.com/massage-admin/massage',
+		redirect : 'https://wwwh5.yurangongfang.com/',
+	},
 }
 
 
@@ -38,6 +42,9 @@ const defaultConfig = {
 			endpoint: 'oss-cn-shenzhen.aliyuncs.com',
 		}
 	},
+	//商户号
+	mchId : '1712378227',
+	appId : 'wxb1c123a63736f789',
 }
 
 

main.js

@@ -25,11 +25,78 @@ import navbar from '@/components/base/navbar.vue'
 Vue.component('configPopup',configPopup)
 Vue.component('navbar',navbar)
 
-const app = new Vue({
-	...App,
-	store,
-})
-app.$mount()
+
+// #ifdef H5
+import { fixH5Router } from '@/utils/h5-router-fix.js'
+import { fixUrlParams } from '@/utils/h5-fix.js'
+
+// 立即执行 H5 修复
+fixH5Router();
+fixUrlParams();
+
+// 设置 Vue 全局错误处理器
+Vue.config.errorHandler = function (err, vm, info) {
+	// 忽略已知的 H5 兼容性错误
+	if (err.message && (
+		err.message.includes("Cannot read property 'meta'") ||
+		err.message.includes('replaceState') ||
+		err.message.includes('showTabBar') ||
+		err.message.includes('History')
+	)) {
+		console.warn('H5兼容性错误已忽略:', err.message);
+		return;
+	}
+	// 其他错误正常输出
+	console.error('Vue Error:', err, vm, info);
+};
+
+import share from '@/utils/share.js'
+share()
+// #endif
+
+
+// H5 环境下的特殊处理
+// #ifdef H5
+Vue.config.silent = false;
+
+// 在创建 Vue 实例前添加额外的错误处理
+const originalConsoleError = console.error;
+console.error = function(...args) {
+	// 过滤掉一些已知的 H5 兼容性错误
+	const message = args.join(' ');
+	if (message.includes("Cannot read property 'meta'") || 
+	    message.includes('replaceState') ||
+	    message.includes('showTabBar')) {
+		console.warn('H5兼容性警告:', message);
+		return;
+	}
+	originalConsoleError.apply(console, args);
+};
+// #endif
+
+try {
+	const app = new Vue({
+		...App,
+		store,
+	})
+	app.$mount()
+} catch(e) {
+	console.error('Vue 应用启动失败:', e);
+	// #ifdef H5
+	// H5 环境下的降级处理
+	setTimeout(() => {
+		try {
+			const app = new Vue({
+				...App,
+				store,
+			})
+			app.$mount()
+		} catch(retryError) {
+			console.error('Vue 应用重试启动失败:', retryError);
+		}
+	}, 100);
+	// #endif
+}
 // #endif
 
 // #ifdef VUE3

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "unapp模板",
-    "appid" : "__UNI__C572032",
+    "appid" : "__UNI__197A38F",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -87,6 +87,8 @@
         },
         "devServer" : {
             "https" : false,
+            "port" : 8002,
+            "disableHostCheck" : true,
             "proxy" : {
                 "/ws/geocoder/v1/" : {
                     "target" : "https://apis.map.qq.com",
@@ -97,6 +99,11 @@
                     "changeOrigin" : true
                 }
             }
-        }
+        },
+        "router" : {
+            "mode" : "hash",
+            "base" : "/"
+        },
+        "publicPath" : "./"
     }
 }

mixins/configList.js

@@ -15,6 +15,11 @@ export default {
 	computed: {
 		...mapState(['configList', 'userInfo', 'riceInfo']),
 	},
+    onLoad(query) {
+        if (query.shareId) {
+            uni.setStorageSync('shareId', query.shareId)
+        }
+    },
 	// 定义全局分享
 	// 1.发送给朋友
     onShareAppMessage(res) {
@@ -41,7 +46,39 @@ export default {
 			o.path = this.Gshare.path + '?shareId=' + this.userInfo.id
 		}
         return o
+    },
+    onLoad(query) {
+        if (query.shareId) {
+            uni.setStorageSync('shareId', query.shareId)
+        }
+    },
+    onShow() {
+        this.setupWeixinShare()
     },
 	methods: {
+        // 设置微信分享内容
+        setupWeixinShare() {
+            if (!this.$jWeixin) return
+
+            this.$jWeixin.ready(() => {
+                const shareData = {
+                    title: this.Gshare.title || '愈然工坊',
+                    desc: this.Gshare.desc || '愈然工坊，温柔呵护每一刻！',
+                    link: this.Gshare.path || location.href.split('#')[0],
+                    imgUrl: this.Gshare.imageUrl || '',
+                    success: () => {
+                    },
+                    cancel: () => {
+                    }
+                }
+
+                // 分享给朋友
+                this.$jWeixin.updateAppMessageShareData(shareData)
+                // 分享到朋友圈
+                this.$jWeixin.updateTimelineShareData(shareData)
+                // 分享到微博
+                this.$jWeixin.onMenuShareWeibo(shareData)
+            })
+        },
 	}
 }

pages.json

@@ -1,35 +1,35 @@
 {
-	"pages": [{
+	"pages": [		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "首页",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/index/order",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "订单",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/index/category",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "商品",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/index/center",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "我的"
 			}
 		},
 		{
 			"path": "pages/index/cart",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "购物车",
 				"enablePullDownRefresh": true
 			}
 		}
@@ -44,78 +44,141 @@
 		"root": "pages_order",
 		"pages": [
 			{
-				"path": "product/productDetail"
+				"path": "product/productDetail",
+				"style": {
+					"navigationBarTitleText": "商品详情"
+				}
 			},
 			{
-				"path": "order/createOrder"
+				"path": "order/createOrder",
+				"style": {
+					"navigationBarTitleText": "创建订单"
+				}
 			},
 			{
 				"path": "order/verifyOrder",
 				"style": {
+					"navigationBarTitleText": "核销订单",
 					"enablePullDownRefresh": true
 				}
 			},
 			{
 				"path": "order/orderDetail",
 				"style": {
+					"navigationBarTitleText": "订单详情",
 					"enablePullDownRefresh": true
 				}
 			},
 			{
-				"path": "mine/memberCenter"
+				"path": "mine/memberCenter",
+				"style": {
+					"navigationBarTitleText": "会员中心"
+				}
 			},
 			{
-				"path": "mine/partner"
+				"path": "mine/partner",
+				"style": {
+					"navigationBarTitleText": "合作伙伴"
+				}
 			},
 			{
-				"path": "mine/withdraw"
+				"path": "mine/withdraw",
+				"style": {
+					"navigationBarTitleText": "提现"
+				}
 			},
 			{
-				"path": "mine/runningWater"
+				"path": "mine/runningWater",
+				"style": {
+					"navigationBarTitleText": "流水记录"
+				}
 			},
 			{
-				"path": "mine/promotion"
+				"path": "mine/promotion",
+				"style": {
+					"navigationBarTitleText": "推广中心"
+				}
 			},
 			{
-				"path": "mine/coupon"
+				"path": "mine/promotionH5",
+				"style": {
+					"navigationBarTitleText": "推广中心"
+				}
 			},
 			{
-				"path": "mine/voucher"
+				"path": "mine/coupon",
+				"style": {
+					"navigationBarTitleText": "优惠券"
+				}
 			},
 			{
-				"path": "mine/verifyVoucher"
+				"path": "mine/voucher",
+				"style": {
+					"navigationBarTitleText": "代金券"
+				}
 			},
 			{
-				"path": "mine/signIn"
+				"path": "mine/verifyVoucher",
+				"style": {
+					"navigationBarTitleText": "核销代金券"
+				}
+			},
+			{
+				"path": "mine/signIn",
+				"style": {
+					"navigationBarTitleText": "签到"
+				}
 			},
 			{
-				"path": "mine/pointsRecord"
+				"path": "mine/pointsRecord",
+				"style": {
+					"navigationBarTitleText": "积分记录"
+				}
 			},
 			{
 				"path": "mine/cooperation",
 				"style": {
+					"navigationBarTitleText": "合作",
 					"enablePullDownRefresh": true
 				}
 			},
 			{
-				"path": "mine/verifyRecord"
+				"path": "mine/verifyRecord",
+				"style": {
+					"navigationBarTitleText": "核销记录"
+				}
 			},
 			{
-				"path": "auth/wxLogin"
+				"path": "auth/wxLogin",
+				"style": {
+					"navigationBarTitleText": "微信登录"
+				}
 			},
 			{
-				"path": "auth/wxUserInfo"
+				"path": "auth/wxUserInfo",
+				"style": {
+					"navigationBarTitleText": "用户信息"
+				}
 			},
 			{
-				"path": "auth/loginAndRegisterAndForgetPassword"
+				"path": "auth/loginAndRegisterAndForgetPassword",
+				"style": {
+					"navigationBarTitleText": "登录注册"
+				}
 			},
 
 
 			{
-				"path": "mine/help"
+				"path": "mine/help",
+				"style": {
+					"navigationBarTitleText": "帮助中心"
+				}
 			},
 			{
-				"path": "home/contact"
+				"path": "home/contact",
+				"style": {
+					"navigationBarTitleText": "联系我们"
+				}
 			}
 		]
 	}],
@@ -126,5 +189,25 @@
 		"backgroundColor": "#F8F8F8",
 		"navigationStyle": "custom"
 	},
+	"tabBar": {
+		"custom": true,
+		"color": "#7A7E83",
+		"selectedColor": "#3cc51f",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
+		"list": [{
+			"pagePath": "pages/index/index",
+			"text": "首页"
+		}, {
+			"pagePath": "pages/index/category",
+			"text": "商品"
+		}, {
+			"pagePath": "pages/index/order",
+			"text": "订单"
+		}, {
+			"pagePath": "pages/index/center",
+			"text": "我的"
+		}]
+	},
 	"uniIdRouter": {}
 }

pages/index/category.vue

@@ -14,7 +14,6 @@
 				v-model="queryParams.title"
 				placeholder="搜索项目名称" 
 				bgColor="#F5F5F5" 
-				inputAlign="center"
 				:showAction="false"
 				@search="search" 
 				@change="search" 
@@ -111,28 +110,18 @@
 		onShow() {
 
 		},
-		onLoad({
-			search,
-			cid
-		}) {
+		onLoad() {
+
+			let search = uni.getStorageSync('search')
+			console.log('onLoad', search)
 
 			if (search) {
 				this.queryParams.title = search
+				uni.setStorageSync('search', '')
 			}
 
 			this.initList()
 
-			return
-			if(this.category.length > 0 && cid){
-				this.category.forEach((n, i) => {
-					if(n.id == cid){
-						this.current = i
-					}
-				})
-				// this.queryParams.classId = cid
-			}else if (this.category.length > 0) {
-				// this.queryParams.classId = this.category[0].id
-			}
 		},
 		methods: {
 			async fetchCategoryList() {
@@ -190,6 +179,7 @@
 			align-items: center;
 		}
 
+		$body-height: calc(100vh - #{$tabbar-height} - env(safe-area-inset-bottom));
 		$search-height: 108rpx;
 		$list-height: calc(#{$body-height} - #{$search-height});
 

pages/index/center.vue

@@ -9,11 +9,12 @@
 			</view>
 			
 			<!-- 登录后显示用户信息 -->
-			<view v-else class="flex flex-column user">
+			<view v-else class="flex flex-column user" @click="$utils.navigateTo('/pages_order/auth/wxUserInfo')">
 				<image class="user-avatar" :src="userInfo.headImage" mode="aspectFill"></image>
 				<view class="user-name">{{ userInfo.nickName }}</view>
 			</view>
 			<view class="member">
+				<image class="member-bg" src="@/pages_order/static/center/member-bg.png" mode="widthFix" ></image>
 				<view class="flex member-overview" :class="[role ? 'is-member' : '']">
 					<template v-if="role">
 						<!-- todo: 缺切图 "皇冠" -->
@@ -32,35 +33,6 @@
 						<button plain class="btn member-btn" @click="$utils.navigateTo('/pages_order/mine/memberCenter')">立即开通</button>
 					</template>
 				</view>
-				<view class="member-rights">
-					<image class="member-rights-bg" src="@/pages_order/static/center/member-bg.png" mode="top" ></image>
-
-					<view class="flex member-rights-content">
-						<view class="flex">
-							<image class="icon icon-rights" src="@/static/image/center/icon-member-weal.png" mode="widthFix"></image>
-							<view>
-								<view class="member-rights-label">会员福利</view>
-								<view class="member-rights-value">会员折扣</view>
-							</view>
-						</view>
-						<view class="flex">
-							<!-- todo: 缺切图 -->
-							<image class="icon icon-rights" src="@/static/image/center/icon-member-weal.png" mode="widthFix"></image>
-							<view>
-								<view class="member-rights-label">会员积分</view>
-								<view class="member-rights-value">兑换礼品</view>
-							</view>
-						</view>
-							<!-- todo: 缺切图 -->
-							<view class="flex">
-							<image class="icon icon-rights" src="@/static/image/center/icon-member-weal.png" mode="widthFix"></image>
-							<view>
-								<view class="member-rights-label">会员优惠券</view>
-								<view class="member-rights-value">满减折扣</view>
-							</view>
-						</view>
-					</view>
-				</view>
 			</view>
 		</view>
 
@@ -97,7 +69,15 @@
 					<image class="fun-common-icon" src="@/static/image/center/icon-team.png" mode="widthFix"></image>
 					<text class="fun-common-label">我的团队</text>
 				</view>
+				
+				<!-- #ifdef MP-WEIXIN -->
 				<view class="flex flex-column" @click="$utils.navigateTo('/pages_order/mine/promotion')">
+				<!-- #endif -->
+				
+				<!-- #ifdef H5 -->
+				<view class="flex flex-column" @click="$utils.navigateTo('/pages_order/mine/promotionH5')">
+				<!-- #endif -->
+					
 					<image class="fun-common-icon" src="@/static/image/center/icon-invite.png" mode="widthFix"></image>
 					<text class="fun-common-label">邀请好友</text>
 				</view>
@@ -139,7 +119,6 @@
 					</view>
 				</view>
 
-				<!-- todo -->
 				<view class="right" @click="onScan">
 					<image class="right-bg" src="@/static/image/center/bg-scan.png"></image>
 				</view>
@@ -180,7 +159,7 @@
 			}
 		},
 		onShow() {
-			if(this.isLogin){
+			if(uni.getStorageSync('token')){
 				this.$store.commit('getUserInfo')
 				this.$store.commit('getUserCenterInfo')
 				this.$store.commit('getRiceInfo')
@@ -188,27 +167,98 @@
 			}
 		},
 		methods: {
+			// #ifdef H5
+			// 检查是否在微信环境
+			isInWechat() {
+				const ua = navigator.userAgent.toLowerCase()
+				return ua.indexOf('micromessenger') !== -1
+			},
+			// #endif
 			clickNo() {
 				uni.showModal({
 					title: '暂未开放',
 				})
 			},
 			logout(){
-					uni.showModal({
-						title: '确认退出登录吗',
-						success : (r) => {
-							if (r.confirm) {
-								this.$store.commit('logout', true)
-							}
-						}
-					})
+                uni.showModal({
+                    title: '确认退出登录吗',
+                    success : (r) => {
+                        if (r.confirm) {
+                            this.$store.commit('logout', true)
+                        }
+                    }
+                })
 			},
 			openServicePopup(phone, title) {
 				// todo 
 				this.$refs.customerServicePopup.open(phone, title)
 			},
 			onScan() {
-				// todo check
+				// #ifdef H5
+				// H5环境下使用微信JSSDK扫码
+				if (!this.isInWechat()) {
+					uni.showToast({
+						title: '请在微信中打开',
+						icon: 'none'
+					})
+					return
+				}
+				
+				if (this.$jWeixin) {
+					this.$jWeixin.ready(() => {
+						this.$jWeixin.scanQRCode({
+							needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果
+							scanType: ["qrCode","barCode"], // 可以指定扫二维码还是一维码，默认二者都有
+							success: (res) => {
+								console.log('H5扫码结果：', res);
+								if (res.resultStr) {
+									// 处理扫码结果
+									const [id, type] = res.resultStr.split(',')
+									console.log('扫码结果：', res.resultStr);
+
+									this.$fetch('overOrder', {
+										orderId : id,
+										type, // type区分，0-订单核销 1-代金券核销
+									}).then(() => {
+										uni.showToast({
+											title: '核销成功',
+											icon: 'none'
+										})
+									}).catch(err => {
+										uni.showToast({
+											title: '核销失败',
+											icon: 'none'
+										})
+									})
+								}
+							},
+							fail: (err) => {
+								console.error('H5扫码失败：', err);
+								uni.showToast({
+									title: '扫码失败',
+									icon: 'none'
+								})
+							}
+						})
+					})
+					
+					this.$jWeixin.error((res) => {
+						console.error('微信配置失败:', res)
+						uni.showToast({
+							title: '微信配置失败',
+							icon: 'none'
+						})
+					})
+				} else {
+					uni.showToast({
+						title: '微信环境异常',
+						icon: 'none'
+					})
+				}
+				// #endif
+				
+				// #ifdef MP-WEIXIN
+				// 小程序环境下使用uni.scanCode
 				uni.scanCode({
 					success: (res) => {
 						console.log(res);
@@ -217,10 +267,6 @@
 							const [id, type] = res.result.split(',')
 							console.log('扫码结果：', res.result);
 
-							console.log('--overOrder', {
-								orderId : id,
-								type, // type区分，0-订单核销 1-代金券核销
-							})
 							this.$fetch('overOrder', {
 								orderId : id,
 								type, // type区分，0-订单核销 1-代金券核销
@@ -229,18 +275,23 @@
 									title: '核销成功',
 									icon: 'none'
 								})
+							}).catch(err => {
+								uni.showToast({
+									title: '核销失败',
+									icon: 'none'
+								})
 							})
 						}
 					},
 					fail: (err) => {
 						console.error('扫码失败：', err);
-
 						uni.showToast({
 							title: '扫码失败',
 							icon: 'none'
 						})
 					}
 				});
+				// #endif
 			},
 			async fetchCouponData() {
 				try {
@@ -262,7 +313,7 @@
 		.header {
 			height: 550rpx;
 			background-image: linear-gradient(#84A73F, #D8FF8F);
-			justify-content: flex-start;
+			justify-content: flex-end;
 			position: relative;
 		}
 	}
@@ -311,19 +362,31 @@
 	}
 
 	.member {
-		width: calc(100vw - 13rpx*2);
-		position: absolute;
-		bottom: 0;
-		left: 13rpx;
+		width: calc(100vw - 8rpx);
+		height: 241rpx;
+		// position: absolute;
+		// bottom: 0;
+		// left: 13rpx;
+		position: relative;
+		margin-top: 37rpx;
+    transform: translateY(10rpx);
 
 		color: #F5F5F5;
 		font-size: 22rpx;
 
-		background-color: #2B2C30;
+		// background-color: #2B2C30;
 		border-top-left-radius: 20rpx;
 		border-top-right-radius: 20rpx;
 
+		&-bg {
+			width: 100%;
+			height: 100%;
+		}
+
 		&-overview {
+			position: absolute;
+			top: 10rpx;
+			left: 30rpx;
 			min-height: 81rpx;
 			justify-content: space-between;
 
@@ -368,39 +431,6 @@
 		&-tips {
 			margin-left: 6rpx;
 		}
-
-		&-rights {
-			background-color: #37393D;
-			position: relative;
-			width: 100%;
-			height: 142rpx;
-			box-sizing: border-box;
-
-			&-bg {
-				width: 100%;
-				height: 100%;
-			}
-
-			&-content {
-				position: absolute;
-				bottom: 0;
-				width: 100%;
-				height: 100%;
-				box-sizing: border-box;
-				padding: 0 35rpx 6rpx 35rpx;
-				justify-content: space-between;
-			}
-
-			&-label {
-				color: #CBAD8F;
-				font-size: 22rpx;
-				font-weight: 700;
-			}
-			&-value {
-				color: #F5F5F5;
-				font-size: 18rpx;
-			}
-		}
 	}
 
 	.card {

pages/index/index.vue

@@ -17,10 +17,9 @@
 			<view class="swipe">
 				<uv-swiper :list="bannerList" indicator indicatorMode="dot" height="340rpx" keyName="image"></uv-swiper>
 			</view>
-
 			
 			<!-- 推荐 -> 会员 -->
-			<view v-if="!role" class="card flex recommend-member" @click="$utils.navigateTo('/pages/index/memberCenter')" >
+			<view v-if="!role" class="card flex recommend-member" @click="$utils.navigateTo('/pages_order/mine/memberCenter')" >
 				<view class="flex" style="flex: 1;">
 					<image class="icon-member" style="" src="@/static/image/home/icon-member.png"></image>
 					<!-- todo: check -->
@@ -98,8 +97,9 @@
 		methods: {
 			// 搜素
 			search() {
-				uni.navigateTo({
-					url: '/pages/index/category?search=' + this.keyword
+				uni.setStorageSync('search', this.keyword)
+				uni.switchTab({
+					url: '/pages/index/category'
 				})
 				this.keyword = ''
 			},

pages_order/auth/wxLogin.vue

@@ -6,9 +6,8 @@
 				{{ configList.config_app_name }}
 			</view>
 		</view>
-		
-		<button class="btn btn-login mt"
-			@click="wxLogin">
+
+		<button class="btn btn-login mt" @click="wxLogin">
 			<view class="icon">
 				<uv-icon name="weixin-fill" color="#ffffff" size="36rpx"></uv-icon>
 			</view>
@@ -20,23 +19,15 @@
 		<button class="btn btn-cancel" :plain="true" :hairline="false" @click="onCancel">
 			暂不登录
 		</button>
-		
+
 		<view class="config mt">
 			<view style="flex: 1;">
-				<uv-checkbox-group
-					v-model="checkboxValue"
-					shape="circle"
-				>
+				<uv-checkbox-group v-model="checkboxValue" shape="circle">
 					<view class="content">
-						<uv-checkbox
-							size="28rpx"
-							icon-size="28rpx"
-							activeColor="#07C261"
-							:name="1"
-						></uv-checkbox>
+						<uv-checkbox size="28rpx" icon-size="28rpx" activeColor="#07C261" :name="1"></uv-checkbox>
 						已同意
 						<text @click="openModal">《注册协议》、隐私协议</text>
-				</view>
+					</view>
 				</uv-checkbox-group>
 			</view>
 			<view class="flex">
@@ -45,138 +36,202 @@
 		</view>
 
 		<agreementModal ref="modal" @confirm="onConfirmAggrement"></agreementModal>
-		
+
 	</view>
 </template>
 
 <script>
-
-import agreementModal from './agreementModal.vue'
-
-export default {
-	name : 'Login',
-	data() {
-		return {
-			checkboxValue : []
-		}
-	},
-	components: {
-		agreementModal
-	},
-	methods: {
-		wxLogin(){
-			if(!this.checkboxValue.length){
-				return uni.showToast({
-					title: '请先同意隐私协议',
-					icon:'none'
-				})
+	import agreementModal from './agreementModal.vue'
+	import Vue from 'vue'
+	export default {
+		name: 'Login',
+		data() {
+			return {
+				checkboxValue: []
 			}
-			this.$store.commit('login')
 		},
-		openModal() {
-			this.$refs.modal.open()
+		components: {
+			agreementModal
 		},
-		onConfirmAggrement(confirm) {
-			if (confirm) {
-				this.checkboxValue = [1]
-			} else {
-				this.checkboxValue = []
+		onShow() {
+			if (this.GetQueryString('code')) { //路径上面有code说明微信已授权
+				this.agreement = true; //勾选协议
+				//直接去登录发起请求
+				this.toWxLogin(this.GetQueryString('code'))
 			}
 		},
-		onCancel() {
-			console.log('--onCancel')
-			uni.reLaunch({
-				url: '/pages/index/index'
-			})
-		},
+		methods: {
+			wxLogin() {
+				if (!this.checkboxValue.length) {
+					return uni.showToast({
+						title: '请先同意隐私协议',
+						icon: 'none'
+					})
+				}
+				
+				
+				// #ifdef MP-WEIXIN
+				this.$store.commit('login')
+				// #endif
+				
+				// #ifdef H5
+				this.getwx_authorize();
+				// #endif
+			},
+			openModal() {
+				this.$refs.modal.open()
+			},
+			onConfirmAggrement(confirm) {
+				if (confirm) {
+					this.checkboxValue = [1]
+				} else {
+					this.checkboxValue = []
+				}
+			},
+			onCancel() {
+				console.log('--onCancel')
+				uni.reLaunch({
+					url: '/pages/index/index'
+				})
+			},
+			getwx_authorize() {
+				console.log(Vue.prototype.$config.redirect);
+				let redirect_uri = encodeURIComponent(Vue.prototype.$config.redirect + '/#/pages_order/auth/wxLogin');
+				let appid = Vue.prototype.$config.appId;
+				window.location.href = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + appid +
+					'&redirect_uri=' + redirect_uri +
+					'&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect' + '&t=' + new Date().getTime();
+			},
+			//获取url中参数的方法
+			GetQueryString(name) {
+				var url = window.location.href;
+				try {
+					var cs = url.split('?')[1]; //获取?之后的参数字符串
+					var cs_arr = cs.split('&'); //参数字符串分割为数组
+					for (var i = 0; i < cs_arr.length; i++) { //遍历数组，拿到json对象
+						if (cs_arr[i].split('=')[0] == name) {
+							return cs_arr[i].split('=')[1];
+						}
+					}
+					return "";
+				} catch {
+					return "";
+				}
+			},
+			//微信登录
+			toWxLogin(code) {
+				let vid = sessionStorage.getItem('vid');
+				this.$api('wxLogin', {
+					code,
+					vid
+				}, res => {
+					if (res.code == 200) {
+						
+						this.$store.commit('h5Login', res.result)
+						
+					} else {
+						location.href = Vue.prototype.$config.redirect + '/#/pages_order/auth/wxLogin'
+					}
+					sessionStorage.removeItem('vid')
+				})
+			},
+		}
 	}
-}
 </script>
 
 <style scoped lang="scss">
-.login{
-	display: flex;
-	justify-content: flex-start;
-	align-items: center;
-	height: 100vh;
-	flex-direction: column;
-	position: relative;
-
-  background: $uni-fg-color;
-	.logo{
-		margin-top: 334rpx;
-		width: 320rpx;
-		image{
-			height: 150rpx;
+	.login {
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+		height: 100vh;
+		flex-direction: column;
+		position: relative;
+
+		background: $uni-fg-color;
+
+		.logo {
+			margin-top: 334rpx;
 			width: 320rpx;
+
+			image {
+				height: 150rpx;
+				width: 320rpx;
+			}
+
+			.text {
+				margin-top: 90rpx;
+				font-size: 38rpx;
+				font-family: PingFang SC, PingFang SC-Bold;
+				font-weight: 700;
+				text-align: center;
+				color: #000000;
+			}
 		}
-		.text{
-			margin-top: 90rpx;
-			font-size: 38rpx;
-			font-family: PingFang SC, PingFang SC-Bold;
-			font-weight: 700;
-			text-align: center;
-			color: #000000;
-		}
-	}
-	.btn{
-		width: 80%;
-		height: 100rpx;
 
-    font-size: 15px;
-    font-family: PingFang SC, PingFang SC-Regular;
-    font-weight: 400;
+		.btn {
+			width: 80%;
+			height: 100rpx;
 
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		border-radius: 50rpx;
-
-		&-login {
-			background-image: linear-gradient(to right, #84A73F, #D8FF8F);
-			color: #fff;
-			border: none;
-			.icon{
-				margin-right: 10rpx;
-				image{
-					width: 40rpx;
-					height: 35rpx;
+			font-size: 15px;
+			font-family: PingFang SC, PingFang SC-Regular;
+			font-weight: 400;
+
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 50rpx;
+
+			&-login {
+				background-image: linear-gradient(to right, #84A73F, #D8FF8F);
+				color: #fff;
+				border: none;
+
+				.icon {
+					margin-right: 10rpx;
+
+					image {
+						width: 40rpx;
+						height: 35rpx;
+					}
 				}
 			}
+
+			&-cancel {
+				height: calc(100rpx - 1rpx * 2);
+				color: #c7c7c7;
+				background-color: transparent;
+				border: 1rpx solid #c7c7c7;
+				margin-top: 60rpx;
+			}
 		}
 
-		&-cancel {
-			height: calc(100rpx - 1rpx * 2);
-			color: #c7c7c7;
-			background-color: transparent;
-			border: 1rpx solid #c7c7c7;
-			margin-top: 60rpx;
+		.mt {
+			margin-top: 200rpx;
 		}
-	}
-	.mt{
-		margin-top: 200rpx;
-	}
-	
-	.config{
-		width: 80%;
-		line-height: 40rpx;
-    // margin-top: 27rpx;
-    color: #C7C7C7;
-    text-align: left;
-		display: flex;
-		.content {
-			font-size: 22rpx;
+
+		.config {
+			width: 80%;
+			line-height: 40rpx;
+			// margin-top: 27rpx;
+			color: #C7C7C7;
+			text-align: left;
 			display: flex;
-			align-items: center;
-		}
-		text{
-			color: #07C261;
+
+			.content {
+				font-size: 22rpx;
+				display: flex;
+				align-items: center;
+			}
+
+			text {
+				color: #07C261;
+			}
 		}
 	}
-}
 
-.flex {
-	display: flex;
-	align-items: center;
-}
-</style>
+	.flex {
+		display: flex;
+		align-items: center;
+	}
+</style>

pages_order/auth/wxUserInfo.vue

@@ -45,6 +45,8 @@
 				<view class="label">
 					手机号
 				</view>
+				
+				<!-- #ifdef MP-WEIXIN -->
 				<view class="content">
 					<input v-if="userInfoForm.phone" 
 						placeholder-class="uni-placeholder"
@@ -64,6 +66,19 @@
 						</button>
 					</view>
 				</view>
+				<!-- #endif -->
+				
+				
+				<!-- #ifdef H5 -->
+				<view class="content">
+					<input
+						placeholder-class="uni-placeholder"
+						placeholder="请输入手机号" 
+						style="text-align: right;"
+						v-model="userInfoForm.phone" 
+					/>
+				</view>
+				<!-- #endif -->
 			</view>
 		</view>
 		
@@ -114,6 +129,26 @@
 					}
 				})
 			},
+			validatePhone(phone) {
+
+					// let fixedLindReg = /(\d{3,4}-)?\d{7,8}$/g // 常见座机格式
+					let mobileReg = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/g // 中国大陆手机号
+
+					// if (fixedLindReg.test(phone)) {
+					// 	return true
+					// }
+
+					if (mobileReg.test(phone)) {
+						return true
+					}
+
+					uni.showToast({
+						title: '请填写正确手机号',
+						icon: "none"
+					})
+
+					return false
+			},
 			submit() {
 				let self = this
 
@@ -134,6 +169,10 @@
 							return
 						}
 						
+						if (!this.validatePhone(self.userInfoForm.phone)) {
+							return
+						}
+						
 						self.$api('updateInfo', {
 							headImage : self.userInfoForm.headImage,
 							nickName : self.userInfoForm.nickName,

pages_order/components/formTextarea.vue

@@ -1,40 +1,32 @@
 <template>
-  <uv-textarea
-    :value="value" 
-    @input="$emit('input', $event)" 
-    :placeholder="placeholder"
-    height="175rpx"
-    border="none"
-    :customStyle="{
+	<uv-textarea :value="value" @input="$emit('input', $event)" :placeholder="placeholder" height="175rpx" border="none"
+		:customStyle="{
       backgroundColor: '#F5F5F5',
-      borderRadius: '6rpx',
-    }"
-    :placeholderStyle="{
-      color: '#999999',
-      fontSize: '28rpx',
-    }"
-  ></uv-textarea>
+      borderRadius: '6rpx',}" 
+	  ></uv-textarea>
+	  
+	  <!-- 
+	  :placeholderStyle="{color: '#999999',
+      fontSize: '28rpx'}" -->
 </template>
 
 
 <script>
 	export default {
-    props: {
+		props: {
 			value: {
 				default: null
 			},
-      placeholder: {
-        type: String,
+			placeholder: {
+				type: String,
 				default: '请输入'
 			},
-    },
+		},
 		data() {
-      return {
-      }
-    },
-    methods: {
-    },
-  }
+			return {}
+		},
+		methods: {},
+	}
 </script>
 
 <style scoped lang="scss">

pages_order/mine/cooperation.vue

@@ -1,405 +1,396 @@
 <template>
-  <view class="page">
+	<view class="page">
 		<!-- 导航栏 -->
 		<navbar title="商家合作" leftClick @leftClick="$utils.navigateBack" color="#fff" />
-  
-    <view v-if="['0', '2'].includes(status) && statusDesc" class="flex tips">
-      <uv-icon name="info-circle" color="#86A941" size="28rpx"></uv-icon>
-      <text style="margin-left: 3rpx;">{{ statusDesc }}</text>
-    </view>
-
-    <view class="content">
-      <view class="form">
-        <view class="form-title">门头照片</view>
-        <view class="card upload">
-          <formUpload v-model="form.image">
-            <template v-slot="{ value }">
-              <view class="flex">
-                <image v-if="value"
-                  class="upload-img"
-                  :src="value" 
-                  mode="aspectFill" 
-                />
-                <image v-else
-                  class="upload-img"
-                  src="../static/cooperation/icon-upload.png" 
-                  mode="aspectFill" 
-                />
-              </view>
-            </template>
-          </formUpload>
-        </view>
-      </view>
-      <view class="form">
-        <view class="form-title">店铺信息</view>
-        <view class="card info">
-          <uv-form 
-            ref="form"
-            :model="form"
-            :rules="rules"
-            labelPosition="left" 
-            labelWidth="150rpx"
-            :labelStyle="{
+
+		<view v-if="['0', '2'].includes(status) && statusDesc" class="flex tips">
+			<uv-icon name="info-circle" color="#86A941" size="28rpx"></uv-icon>
+			<text style="margin-left: 3rpx;">{{ statusDesc }}</text>
+		</view>
+
+		<view class="content">
+			<view class="form">
+				<view class="form-title">门头照片</view>
+				<view class="card upload">
+					<formUpload v-model="form.image">
+						<view class="flex">
+							<image v-if="form.image" class="upload-img" :src="form.image" mode="aspectFill" />
+							<image v-else class="upload-img" src="../static/cooperation/icon-upload.png" mode="aspectFill" />
+						</view>
+					</formUpload>
+				</view>
+			</view>
+			<view class="form">
+				<view class="form-title">店铺信息</view>
+				<view class="card info">
+					<uv-form ref="form" :model="form" :rules="rules" labelPosition="left" labelWidth="150rpx"
+						:labelStyle="{
               color: '#000000',
               fontSize: '28rpx',
-            }"
-          >
-            <view class="form-item">
-              <uv-form-item label="店铺名称" prop="shop">
-                <view class="form-item-content">
-                  <formInput v-model="form.shop" placeholder="请输入店铺名称"></formInput>
-                </view>
-              </uv-form-item>
-            </view>
-            <view class="form-item">
-              <uv-form-item label="您的姓名" prop="name">
-                <view class="form-item-content">
-                  <formInput v-model="form.name" placeholder="请输入您的姓名"></formInput>
-                </view>
-              </uv-form-item>
-            </view>
-            <view class="form-item">
-              <uv-form-item label="联系手机号" prop="phone">
-                <view class="form-item-content">
-                  <formInput v-model="form.phone" placeholder="请输入您的手机号"></formInput>
-                </view>
-              </uv-form-item>
-            </view>
-            <view class="form-item">
-              <uv-form-item label="所在地区" prop="area">
-                <view class="form-item-content flex area">
-                  <text>{{ form.area ? form.area : '请选择' }}</text>
-                  <button plain class="btn area-btn" @click="selectAddr">
-                    <image class="area-btn-icon" src="../static/cooperation/icon-arrow.png" mode="widthFix"></image>
-                  </button>
-                </view>
-              </uv-form-item>
-            </view>
-            <view class="form-item address">
-              <uv-form-item label="详细地址" prop="address" labelPosition="top" >
-                <view style="margin-top: 22rpx;">
-                  <formTextarea
-                    v-model="form.address" 
-                    placeholder="请输入详细地址"
-                  ></formTextarea>
-                </view>
-              </uv-form-item>
-            </view>
-          </uv-form>
-        </view>
-      </view>
-      <view class="tools" v-if="status != '1'">
-        <button plain class="btn btn-submit" @click="onSubmit">提交</button>
-      </view>
-    </view>
-  </view>
+            }">
+						<view class="form-item">
+							<uv-form-item label="店铺名称" prop="shop">
+								<view class="form-item-content">
+									<formInput v-model="form.shop" placeholder="请输入店铺名称"></formInput>
+								</view>
+							</uv-form-item>
+						</view>
+						<view class="form-item">
+							<uv-form-item label="您的姓名" prop="name">
+								<view class="form-item-content">
+									<formInput v-model="form.name" placeholder="请输入您的姓名"></formInput>
+								</view>
+							</uv-form-item>
+						</view>
+						<view class="form-item">
+							<uv-form-item label="联系手机号" prop="phone">
+								<view class="form-item-content">
+									<formInput v-model="form.phone" placeholder="请输入您的手机号"></formInput>
+								</view>
+							</uv-form-item>
+						</view>
+						<view class="form-item">
+							<uv-form-item label="所在地区" prop="area">
+								<view class="form-item-content flex area">
+									<view style="width: 450rpx;">{{ form.area ? form.area : '请选择' }}</view>
+									<button plain class="btn area-btn" @click="selectAddr">
+										<image class="area-btn-icon" src="../static/cooperation/icon-arrow.png"
+											mode="widthFix"></image>
+									</button>
+								</view>
+							</uv-form-item>
+						</view>
+						<view class="form-item address">
+							<uv-form-item label="详细地址" prop="address" labelPosition="top">
+								<view style="margin-top: 22rpx;width: 100%;">
+									<formTextarea v-model="form.address" placeholder="请输入详细地址"></formTextarea>
+								</view>
+							</uv-form-item>
+						</view>
+					</uv-form>
+				</view>
+			</view>
+			<view class="tools" v-if="status != '1'">
+				<button plain class="btn btn-submit" @click="onSubmit">提交</button>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-import { mapState } from 'vuex'
-
-import Position from '@/utils/position.js'
-
-import formInput from '../components/formInput.vue'
-import formUpload from '../components/formUpload.vue'
-import formTextarea from '../components/formTextarea.vue'
-
-export default {
-  components: {
-    formInput,
-    formUpload,
-    formTextarea,
-  },
-  data() {
-    return {
-      id: null,
-      status: null,
-      statusDesc: null,
-      form: {
-        image: null,
-        shop: null,
-        name: null,
-        phone: null,
-        area: null,
-        latitude: null,
-        longitude: null,
-        address: null,
-      },
-      rules: {
-        'image': {
-          type: 'string',
-          required: true,
-          message: '请选择门头照片',
-        },
-        'shop': {
-          type: 'string',
-          required: true,
-          message: '请输入店铺名称',
-        },
-        'name': {
-          type: 'string',
-          required: true,
-          message: '请输入您的姓名',
-        },
-        'phone': {
-          type: 'string',
-          required: true,
-          message: '请输入您的手机号',
-        },
-        'area': {
-          type: 'string',
-          required: true,
-          message: '请选择所在地区',
-        },
-        'address': {
-          type: 'string',
-          required: true,
-          message: '请输入详细地址',
-        },
-      },
-    }
-  },
-  computed: {
-    ...mapState(['userInfo']),
-  },
-  onLoad() {
-    this.initData()
-  },
-  onPullDownRefresh() {
-    this.updateStatus()
-  },
-  methods: {
-    //地图上选择地址
-    selectAddr() {
-      // Position.getLocation(res => {
-        Position.selectAddress(0, 0, success => {
-          this.setAddress(success)
-        })
-      // })
-    },
-    //提取用户选择的地址信息复制给表单数据
-    setAddress(res) {
-      //经纬度信息
-      this.form.latitude = res.latitude
-      this.form.longitude = res.longitude
-
-      if (!res.address && res.name) { //用户直接选择城市的逻辑
-        return this.form.area = res.name
-      }
-      if (res.address || res.name) {
-        return this.form.area = res.address + res.name
-      }
-      this.form.area = '' //用户啥都没选就点击勾选
-    },
-    async initData() {
-
-      try {
-        const shopDetails = (await this.$fetch('queryShopById'))
-		
-		console.log("shopDetails======")
-		console.log(shopDetails)
-
-        if (!shopDetails) {
-          return
-        }
-		
-		
-
-        const {
-          id,
-          status,
-          status_dictText,
-          remark,
-          image,
-          shop,
-          name,
-          phone,
-          area,
-          latitude,
-          longitude,
-          address,
-        } = shopDetails
-
-        this.form = {
-          image,
-          shop,
-          name,
-          phone,
-          area,
-          latitude,
-          longitude,
-          address,
-        }
-        this.id = id
-        this.status = status
-        this.statusDesc = status == '2' ? `${status_dictText}：${remark}` : status_dictText
-
-      } catch (err) {
-        
-      }
-    },
-    async updateStatus() {
-      if (!this.id) {
-        return
-      }
-
-      try {
-        const { status, status_dictText, remark } = await this.$fetch('queryShopById', { id: this.id })
-
-        this.status = status
-        this.statusDesc = status == '2' ? `${status_dictText}：${remark}` : status_dictText
-      } catch (err) {
-        console.log('--err', err)
-      }
-
-      uni.stopPullDownRefresh();
-    },
-    async onSubmit() {
-      try {
-
-        await this.$refs.form.validate()
-
-        const {
-          image,
-          shop,
-          name,
-          phone,
-          area,
-          latitude,
-          longitude,
-          address,
-        } = this.form
-
-        const params = {
-          image,
-          shop,
-          name,
-          phone,
-          area,
-          latitude,
-          longitude,
-          address,
-        }
-
-        let api = this.id ? 'updateShop' : 'addShop'
-    
-        await this.$fetch(api, params)
-        
-        uni.showToast({
-          title: '提交成功',
-          icon: 'none'
-        })
-
-        setTimeout(uni.navigateBack, 1000, -1)
-          
-      } catch (err) {
-        
-      }
-
-    },
-  },
-}
+	import {
+		mapState
+	} from 'vuex'
+
+	import Position from '@/utils/position.js'
+
+	import formInput from '../components/formInput.vue'
+	import formUpload from '../components/formUpload.vue'
+	import formTextarea from '../components/formTextarea.vue'
+
+	export default {
+		components: {
+			formInput,
+			formUpload,
+			formTextarea,
+		},
+		data() {
+			return {
+				id: null,
+				status: null,
+				statusDesc: null,
+				form: {
+					image: null,
+					shop: null,
+					name: null,
+					phone: null,
+					area: null,
+					latitude: null,
+					longitude: null,
+					address: null,
+				},
+				rules: {
+					'image': {
+						type: 'string',
+						required: true,
+						message: '请选择门头照片',
+					},
+					'shop': {
+						type: 'string',
+						required: true,
+						message: '请输入店铺名称',
+					},
+					'name': {
+						type: 'string',
+						required: true,
+						message: '请输入您的姓名',
+					},
+					'phone': {
+						type: 'string',
+						required: true,
+						message: '请输入您的手机号',
+					},
+					'area': {
+						type: 'string',
+						required: true,
+						message: '请选择所在地区',
+					},
+					'address': {
+						type: 'string',
+						required: true,
+						message: '请输入详细地址',
+					},
+				},
+			}
+		},
+		computed: {
+			...mapState(['userInfo']),
+		},
+		onLoad() {
+			this.initData()
+		},
+		onPullDownRefresh() {
+			this.updateStatus()
+		},
+		methods: {
+			//地图上选择地址
+			selectAddr() {
+				// Position.getLocation(res => {
+				Position.selectAddress(0, 0, success => {
+					this.setAddress(success)
+				})
+				// })
+			},
+			//提取用户选择的地址信息复制给表单数据
+			setAddress(res) {
+				//经纬度信息
+				this.form.latitude = res.latitude
+				this.form.longitude = res.longitude
+
+				if (!res.address && res.name) { //用户直接选择城市的逻辑
+					return this.form.area = res.name
+				}
+				if (res.address || res.name) {
+					return this.form.area = res.address + res.name
+				}
+				this.form.area = '' //用户啥都没选就点击勾选
+			},
+			async initData() {
+
+				try {
+					const shopDetails = (await this.$fetch('queryShopById'))
+
+					console.log("shopDetails======")
+					console.log(shopDetails)
+
+					if (!shopDetails) {
+						return
+					}
+
+
+
+					const {
+						id,
+						status,
+						status_dictText,
+						remark,
+						image,
+						shop,
+						name,
+						phone,
+						area,
+						latitude,
+						longitude,
+						address,
+					} = shopDetails
+
+					this.form = {
+						image,
+						shop,
+						name,
+						phone,
+						area,
+						latitude,
+						longitude,
+						address,
+					}
+					this.id = id
+					this.status = status
+					this.statusDesc = status == '2' ? `${status_dictText}：${remark}` : status_dictText
+
+				} catch (err) {
+
+				}
+			},
+			async updateStatus() {
+				if (!this.id) {
+					return
+				}
+
+				try {
+					const {
+						status,
+						status_dictText,
+						remark
+					} = await this.$fetch('queryShopById', {
+						id: this.id
+					})
+
+					this.status = status
+					this.statusDesc = status == '2' ? `${status_dictText}：${remark}` : status_dictText
+				} catch (err) {
+					console.log('--err', err)
+				}
+
+				uni.stopPullDownRefresh();
+			},
+			async onSubmit() {
+				try {
+
+					await this.$refs.form.validate()
+
+					const {
+						image,
+						shop,
+						name,
+						phone,
+						area,
+						latitude,
+						longitude,
+						address,
+					} = this.form
+
+					const params = {
+						image,
+						shop,
+						name,
+						phone,
+						area,
+						latitude,
+						longitude,
+						address,
+					}
+
+					let api = this.id ? 'updateShop' : 'addShop'
+
+					await this.$fetch(api, params)
+
+					uni.showToast({
+						title: '提交成功',
+						icon: 'none'
+					})
+
+					setTimeout(uni.navigateBack, 1000, -1)
+
+				} catch (err) {
+
+				}
+
+			},
+		},
+	}
 </script>
 
 <style lang="scss" scoped>
 	.page {
 		background-color: $uni-bg-color;
 		min-height: 100vh;
-				
+
 		/deep/ .nav-bar__view {
 			background-image: linear-gradient(#84A73F, #D8FF8F);
 		}
 	}
 
-  .tips {
-    padding: 5rpx 0;
-    font-weight: bold;
-    font-size: 28rpx;
-    color: $uni-color;
-    background-color: rgba($color: #D8FF8F, $alpha: 0.3);
-  }
-
-  .content {
-    padding: 28rpx 30rpx;
-  }
-
-  
-  .form {
-    & + & {
-      margin-top: 44rpx;
-    }
-
-    &-title {
-      color: #000000;
-      font-size: 28rpx;
-      margin-bottom: 15rpx;
-    }
-
-    &-item {
-      padding-left: 8rpx;
-
-      & + & {
-        // margin-top: 20rpx;
-        border-top: 1rpx solid rgba($color: #C7C7C7, $alpha: 0.69);
-      }
-
-      &-content {
-        min-height: 60rpx;
-        display: flex;
-        align-items: center;
-        justify-content: flex-end;
-        font-size: 28rpx;;
-        color: #999999;
-      }
-    }
-  }
-
-  .upload {
-    padding: 37rpx 22rpx;
-
-    &-img {
-      width: 131rpx; height: 131rpx;
-    }
-  }
-
-  .area {
-    color: #000000;
-    font-size: 28rpx;
-    line-height: 40rpx; 
-    justify-content: flex-end;
-
-    &-btn {
-      border: none;
-      padding: 7rpx 20rpx 7rpx 7rpx;
-
-      &-icon {
-        width: 30rpx;
-        height: auto;
-      }
-    }
-  }
-
-  .address {
-    padding: 0;
-
-    /deep/ .uv-form-item__body__left__content {
-      margin-top: 10rpx;
-      padding-left: 8rpx;
-    }
-  }
-
-  .tools {
-    padding: 0 56rpx;
-    margin-top: 126rpx;
-  }
-
-  .btn-submit {
-    padding: 29rpx 0;
-    border: none;
-    font-size: 36rpx;
-    border-radius: 45rpx;
-    color: $uni-text-color-inverse;
-    background-image: linear-gradient(to right, #84A73F, #D8FF8F);
-  }
-  
+	.tips {
+		padding: 5rpx 0;
+		font-weight: bold;
+		font-size: 28rpx;
+		color: $uni-color;
+		background-color: rgba($color: #D8FF8F, $alpha: 0.3);
+	}
+
+	.content {
+		padding: 28rpx 30rpx;
+	}
+
+
+	.form {
+		&+& {
+			margin-top: 44rpx;
+		}
+
+		&-title {
+			color: #000000;
+			font-size: 28rpx;
+			margin-bottom: 15rpx;
+		}
+
+		&-item {
+			padding-left: 8rpx;
+
+			&+& {
+				// margin-top: 20rpx;
+				border-top: 1rpx solid rgba($color: #C7C7C7, $alpha: 0.69);
+			}
+
+			&-content {
+				min-height: 60rpx;
+				display: flex;
+				align-items: center;
+				justify-content: flex-end;
+				font-size: 28rpx;
+				;
+				color: #999999;
+			}
+		}
+	}
+
+	.upload {
+		padding: 37rpx 22rpx;
+
+		&-img {
+			width: 131rpx;
+			height: 131rpx;
+		}
+	}
+
+	.area {
+		color: #000000;
+		font-size: 28rpx;
+		line-height: 40rpx;
+		justify-content: flex-end;
+
+		&-btn {
+			border: none;
+			padding: 7rpx 20rpx 7rpx 7rpx;
+
+			&-icon {
+				width: 30rpx;
+				height: auto;
+			}
+		}
+	}
+
+	.address {
+		padding: 0;
+
+		/deep/ .uv-form-item__body__left__content {
+			margin-top: 10rpx;
+			padding-left: 8rpx;
+		}
+	}
+
+	.tools {
+		padding: 0 56rpx;
+		margin-top: 126rpx;
+	}
+
+	.btn-submit {
+		padding: 29rpx 0;
+		border: none;
+		font-size: 36rpx;
+		border-radius: 45rpx;
+		color: $uni-text-color-inverse;
+		background-image: linear-gradient(to right, #84A73F, #D8FF8F);
+	}
 </style>

pages_order/mine/coupon.vue

@@ -32,7 +32,7 @@
 			></uv-tabs>
 		</view>
 
-		<couponList ref="couponList" :list="list" :status="status"></couponList>
+		<couponList ref="couponList" :status="status"></couponList>
 	</view>
 </template>
 
@@ -50,7 +50,9 @@
 			},
 		},
 		onShow() {
-			this.getCouponList()
+			this.$nextTick(() => {
+				this.getCouponList()
+			})
 		},
 		data() {
 			return {

pages_order/mine/help.vue

@@ -21,8 +21,8 @@
 				<view class="help-screenshot">
 					<uv-upload :fileList="fileList" multiple :maxCount="3" width="180rpx" height="180rpx" multiple
 						@afterRead="afterRead" @delete="deleteImage">
-						<image src="../static/help/uploading.png" mode="aspectFill"
-							style="width: 180rpx;height: 180rpx;" />
+						<!-- <image src="../static/help/uploading.png" mode="aspectFill"
+							style="width: 180rpx;height: 180rpx;" /> -->
 					</uv-upload>
 				</view>
 			</view>

pages_order/mine/memberCenter.vue

@@ -28,7 +28,7 @@
 			</view>
 			<view class="consumption" v-if="!role">
 				<!-- todo: 对接接口 -->
-				<progress :current="1000" :total="3800"></progress>
+				<memberProgress :current="1000" :total="3800"></memberProgress>
 				<text class="consumption-desc">{{ `累积消费达到${3800}元或直接充值即可成为会员` }}</text>
 			</view>
 			<view class="charge">
@@ -76,7 +76,8 @@
 </template>
 
 <script>
-	import progress from '../components/progress.vue'
+	import memberProgress from '../components/memberProgress.vue'
+	import mixinsConfigList from '@/mixins/configList.js'
 
 	import {
 		mapGetters,
@@ -85,8 +86,9 @@
 
 	export default {
 		name: "MemberCenter",
+		mixins: [mixinsConfigList],
 		components: {
-			progress,
+			memberProgress,
 		},
 		data() {
 			return {
@@ -95,7 +97,9 @@
 			}
 		},
 		onShow() {
+			// #ifdef H5
 			this.fetchCargeOptions()
+			// #if
 		},
 		computed: {
 			...mapGetters(['role']),
@@ -120,17 +124,22 @@
 				this.selectedChargeId = id
 			},
 			async submit() {
-				// todo: check jump to create order ?
-
 				try {
-
 					let params = {
 						comoId: this.selectedChargeId
 					}
 
 					let result = await this.$fetch('addVip', params)
 
+					// #ifdef H5
+					// H5环境下使用微信JSSDK支付
+						await this.$wxPay({result})
+					// #endif
+
+					// #ifdef MP-WEIXIN
+					// 小程序环境使用原有支付方式
 					await uni.requestPaymentWxPay({result})
+					// #endif
 
 					uni.showToast({
 						title: '充值成功',
@@ -139,36 +148,19 @@
 					setTimeout(uni.navigateBack, 800, -1)
 
 				} catch (err) {
+					console.error('支付失败:', err)
+					if (err.type === 'cancel') {
+						uni.showToast({
+							title: '用户取消支付',
+							icon: 'none'
+						})
+					} else {
+						uni.showToast({
+							title: '支付失败',
+							icon: 'none'
+						})
+					}
 				}
-
-				return
-
-				// this.$api('addVip', {
-				// 	comoId: this.selectedChargeId
-				// }, 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);
-				// 			},
-				// 			fail: function(err) {
-				// 				console.log('支付失败', err);
-				// 				uni.showToast({
-				// 					icon: 'none',
-				// 					title: "支付失败"
-				// 				})
-				// 			}
-				// 		});
-
-				// 	}
-				// })
 			}
 		}
 	}

pages_order/mine/partner.vue

@@ -13,7 +13,7 @@
 					<view class="phone">{{ userInfo.phone }}</view>
 					<view class="flex account">
 						<view class="count">
-							<view><text class="count-unit">¥</text>{{ riceInfo.canWithdraw || 0 }}</view>
+							<view><text class="count-unit">¥</text>{{ userInfo.recommendAmount || 0 }}</view>
 							<view class="count-desc">推广佣金</view>
 						</view>
 						<button plain class="btn" @click="$utils.navigateTo('/pages_order/mine/withdraw')">去提现</button>
@@ -25,7 +25,7 @@
 		<view class="list">
 			<view class="list-header">
 				<view class="list-header-title">
-					<text>直推用户<text class="sub">{{ `（${total}人）` }}</text></text>
+					<text>直推用户<text class="sub">{{ `（${total || 0}人）` }}</text></text>
 					<view class="list-header-title-line"></view>
 				</view>
 			</view>

pages_order/mine/promotion.vue

@@ -1,14 +1,14 @@
 <template>
 	<view class="page">
-		
+
 		<navbar title="邀请好友" leftClick @leftClick="$utils.navigateBack" color="#fff" />
-		
+
 
 		<view class="flex flex-column content">
 
-      <view style="width: 698rpx; height: 788rpx; border-radius: 16rpx; overflow: hidden;">
-        <canvas id="myCanvas" canvas-id="firstCanvas1" type="2d" style="width: 100%; height: 100%;"></canvas>
-      </view>
+			<view style="width: 698rpx; height: 788rpx; border-radius: 16rpx; overflow: hidden;">
+				<canvas id="myCanvas" canvas-id="firstCanvas1" type="2d" style="width: 100%; height: 100%;"></canvas>
+			</view>
 
 			<view class="tools">
 				<button plain class="flex btn" @click="saveImg">
@@ -17,13 +17,15 @@
 			</view>
 
 		</view>
-		
+
 	</view>
 </template>
 
 <script>
-	import { mapState } from 'vuex'
-	
+	import {
+		mapState
+	} from 'vuex'
+
 	export default {
 		name: 'Promotion',
 		computed: {
@@ -36,19 +38,22 @@
 				canvas: {},
 			}
 		},
-    onReady() {
-      this.fetchQrCode()
-    },
+		onReady() {
+			this.fetchQrCode()
+		},
 		methods: {
-      async fetchQrCode() {
-        try {
-          this.wxCodeImage = (await this.$fetch('getInviteCode'))?.url
-
-          this.draw()
-        } catch (err) {
-          
-        }
-      },
+			async fetchQrCode() {
+				try {
+					
+					// #ifdef MP-WEIXIN
+					this.wxCodeImage = (await this.$fetch('getInviteCode'))?.url
+					// #endif
+
+					this.draw()
+				} catch (err) {
+
+				}
+			},
 			draw() {
 
 				uni.showLoading({
@@ -99,45 +104,45 @@
 						const codeY = 645 * Ratio / dpr
 						// todo: fetch code
 						ctx.fillText(`邀请码：${'YFY1688'}`, codeX, codeY);
-  
+
 						//二维码图片
 						const coderImage = canvas.createImage()
 						coderImage.src = this.wxCodeImage
-						coderImage.onload = () => {
-							const x = 158 * Ratio / dpr
-							const y = 188 * Ratio / dpr
-							const size = 382 * Ratio / dpr
-							ctx.drawImage(coderImage, x, y, size, size)
+						// coderImage.onload = () => {
+						// 	const x = 158 * Ratio / dpr
+						// 	const y = 188 * Ratio / dpr
+						// 	const size = 382 * Ratio / dpr
+						// 	ctx.drawImage(coderImage, x, y, size, size)
 
 							uni.hideLoading()
-						}
+						// }
 
 					})
 
 			},
-      saveImg(){
-        this.$authorize('scope.writePhotosAlbum').then((res) => {
-          this.imgApi()
-        })
-      },
+			saveImg() {
+				this.$authorize('scope.writePhotosAlbum').then((res) => {
+					this.imgApi()
+				})
+			},
 			imgApi() {
-        wx.canvasToTempFilePath({
-          x: 0,
-          y: 0,
-          width: this.canvas.width,
-          height: this.canvas.height,
-          canvas: this.canvas,
-          success: (res) => {
-            let tempFilePath = res.tempFilePath;
-            this.saveImgToPhone(tempFilePath)
-          },
-          fail: (err) => {
-            console.log('--canvasToTempFilePath--fail', err)
-          }
-        }, this);
+				wx.canvasToTempFilePath({
+					x: 0,
+					y: 0,
+					width: this.canvas.width,
+					height: this.canvas.height,
+					canvas: this.canvas,
+					success: (res) => {
+						let tempFilePath = res.tempFilePath;
+						this.saveImgToPhone(tempFilePath)
+					},
+					fail: (err) => {
+						console.log('--canvasToTempFilePath--fail', err)
+					}
+				}, this);
 
 			},
-      saveImgToPhone(image) {
+			saveImgToPhone(image) {
 				/* 获取图片的信息 */
 				uni.getImageInfo({
 					src: image,
@@ -158,17 +163,16 @@
 						});
 					}
 				});
-      }
+			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-
 	.page {
 		background-color: $uni-bg-color;
 		min-height: 100vh;
-				
+
 		/deep/ .nav-bar__view {
 			background-image: linear-gradient(#84A73F, #D8FF8F);
 		}
@@ -179,7 +183,7 @@
 		padding: 48rpx 26rpx;
 	}
 
-	.image{
+	.image {
 		width: 100%;
 		height: 778rpx;
 	}
@@ -189,7 +193,7 @@
 		width: 100%;
 		padding: 0 56rpx;
 		box-sizing: border-box;
-	
+
 		.btn {
 			width: 100%;
 			padding: 29rpx 0;

pages_order/mine/promotionH5.vue

@@ -0,0 +1,602 @@
+<template>
+	<view class="placard">
+		<view class="placard-content">
+			<!-- H5环境显示最终图片 -->
+			<view v-if="tempFilePath" class="img-box" :style="{ width: canvasW + 'px', height: canvasH + 'px' }">
+				<img 
+					:src="tempFilePath" 
+					:style="{ width: canvasW + 'px', height: canvasH + 'px' }" 
+					@contextmenu.prevent
+					style="display: block; border-radius: 10px;"
+				/>
+			</view>
+			
+			<!-- 生成中的提示 -->
+			<view v-else class="loading-box" :style="{ width: canvasW + 'px', height: canvasH + 'px' }">
+				<view class="loading-content">
+					<view class="loading-spinner"></view>
+					<text class="loading-text">
+						{{ !userId ? '获取用户信息中...' : '海报生成中...' }}
+					</text>
+				</view>
+			</view>
+			
+			<!-- 二维码组件 - 隐藏 -->
+			<view v-if="userId" class="qrcode" ref="qrcode">
+				<uv-qrcode 
+					:value="qrCodeValue" 
+					:size="qrCodeSize"
+					type="image/png"
+					ref="qrCodeComponent"
+					@complete="onQRCodeComplete">
+				</uv-qrcode>
+			</view>
+			
+			<!-- 画布 - 隐藏 -->
+			<canvas 
+				:style="{ width: canvasW + 'px', height: canvasH + 'px' }"
+				canvas-id="myCanvas" 
+				id="myCanvas"
+				:width="canvasW"
+				:height="canvasH"
+				class="hidden-canvas">
+			</canvas>
+				
+			<view class="add-btn">
+				<view class="btn" @click="handleSaveImage">
+					长按图片保存到手机
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import Vue from 'vue'
+	import { mapState } from 'vuex'
+	
+	export default {
+		name: 'Placard',
+		computed: {
+			...mapState(['userInfo']),
+			// 获取用户ID
+			userId() {
+				return this.userInfo?.id || ''
+			},
+			// 动态生成二维码内容
+			qrCodeContent() {
+				if (this.userId) {
+					return Vue.prototype.$config.redirect + `?vid=${this.userId}`
+				}
+				return Vue.prototype.$config.redirect
+			}
+		},
+		data() {
+			return {
+				qrCodeValue: '', // 初始为空，等用户信息加载后再设置
+				qrCodeSize: 180,
+				qrCodeDarkColor: '#000',
+				qrCodeLightColor: '#fff',
+				margin: 0,
+
+				//画布信息
+				canvasW: 299,
+				canvasH: 403,
+
+				//设备信息
+				systemInfo: {},
+
+				//图片路径
+				tempFilePath: '',
+
+				_rpx: 1, // H5环境使用固定比例
+				_center: 0,
+				
+				// 二维码是否生成完成
+				qrCodeReady: false,
+				
+				// 重试次数
+				retryCount: 0,
+				maxRetry: 1,
+				
+				// 用户信息是否已加载
+				userInfoLoaded: false
+			}
+		},
+		watch: {
+			// 监听用户信息变化
+			userInfo: {
+				handler(newVal) {
+					if (newVal && newVal.id) {
+						this.userInfoLoaded = true
+						this.qrCodeValue = this.qrCodeContent
+						// 如果二维码还未生成，现在生成
+						if (!this.qrCodeReady) {
+							this.$nextTick(() => {
+								this.generateQRCode()
+							})
+						}
+					}
+				},
+				deep: true,
+				immediate: true
+			}
+		},
+		mounted() {
+			this.initCanvas()
+		},
+		onShow() {
+			// 页面显示时确保获取用户信息
+			this.getUserInfo()
+		},
+		methods: {
+			// 初始化画布
+			initCanvas() {
+				// H5环境使用固定尺寸，便于显示
+				this.canvasW = 349
+				this.canvasH = 389
+				this.qrCodeSize = 180
+				this._center = this.canvasW / 2
+				
+				// 检查用户信息是否已加载
+				if (this.userInfoLoaded && this.qrCodeValue) {
+					this.generateQRCode()
+				} else {
+					// 获取用户信息
+					this.getUserInfo()
+				}
+			},
+			
+			// 获取用户信息
+			getUserInfo() {
+				// 如果store中没有用户信息，尝试获取
+				if (!this.userInfo?.id) {
+					this.$store.commit('getUserInfo')
+				}
+			},
+			
+			// 生成二维码
+			generateQRCode() {
+				// 确保有用户ID才生成二维码
+				if (!this.userId) {
+					console.log('等待用户信息加载...')
+					return
+				}
+				
+				// 确保二维码内容已设置
+				if (!this.qrCodeValue) {
+					this.qrCodeValue = this.qrCodeContent
+				}
+				
+				console.log('生成二维码，内容：', this.qrCodeValue)
+				
+				this.$nextTick(() => {
+					if (this.$refs.qrCodeComponent) {
+						this.$refs.qrCodeComponent.make()
+					}
+				})
+			},
+			
+			// 二维码生成完成回调
+			onQRCodeComplete(res) {
+				if (res.success) {
+					this.qrCodeReady = true
+					this.draw()
+				}
+			},
+			
+			// 绘制海报
+			async draw() {
+				if (!this.qrCodeReady) {
+					console.log('二维码未准备好')
+					return
+				}
+				
+				const ctx = uni.createCanvasContext('myCanvas', this)
+				
+				// 设置背景色
+				ctx.setFillStyle('#ffffff')
+				ctx.fillRect(0, 0, this.canvasW, this.canvasH)
+
+				ctx.setFillStyle('#000000')
+				ctx.setFontSize(16)
+		
+				let text = '邀请好友'
+				// 计算文本的宽度和高度
+				let metrics = ctx.measureText(text);
+				ctx.fillText(text, this._center - metrics.width / 2, 53);
+
+				text = `邀请码：${this.userId}`
+				// 计算文本的宽度和高度
+				metrics = ctx.measureText(text);
+				// todo: check code
+				ctx.fillText(text, this._center - metrics.width / 2, 342);
+				
+				
+				// 获取二维码图片并绘制
+				try {
+					const qrCodeImagePath = await this.getQRCodeImage()
+					if (qrCodeImagePath) {
+						const qrSize = 192
+						const qrX = (this.canvasW - qrSize) / 2
+						const qrY = 94
+						
+						ctx.drawImage(qrCodeImagePath, qrX, qrY, qrSize, qrSize)
+					}
+				} catch (e) {
+					console.log('二维码绘制失败', e)
+				}
+
+				// 执行绘制
+				ctx.draw(false, () => {
+					// 导出图片
+					setTimeout(() => {
+						this.canvasToTempFilePath()
+					}, 1000)
+				})
+				
+				return
+				
+				// 绘制标题
+				ctx.setFillStyle('#333333')
+				ctx.setFontSize(18)
+				ctx.setTextAlign('center')
+				ctx.fillText('邀请好友一起享受优质服务', this.canvasW / 2, 30)
+				
+				// 绘制用户头像(如果有)
+				if (this.userInfo.headImage) {
+					try {
+						// 先下载图片到本地
+						const avatarPath = await this.downloadImage(this.userInfo.headImage)
+						const avatarSize = 60
+						const avatarX = (this.canvasW - avatarSize) / 2
+						const avatarY = 50
+						
+						// 绘制圆形头像背景
+						ctx.setFillStyle('#f0f0f0')
+						ctx.beginPath()
+						ctx.arc(avatarX + avatarSize / 2, avatarY + avatarSize / 2, avatarSize / 2, 0, 2 * Math.PI)
+						ctx.fill()
+						
+						// 绘制圆形头像
+						ctx.save()
+						ctx.beginPath()
+						ctx.arc(avatarX + avatarSize / 2, avatarY + avatarSize / 2, avatarSize / 2, 0, 2 * Math.PI)
+						ctx.clip()
+						ctx.drawImage(avatarPath, avatarX, avatarY, avatarSize, avatarSize)
+						ctx.restore()
+					} catch (e) {
+						console.log('头像绘制失败', e)
+						// 绘制默认头像圆圈
+						const avatarSize = 60
+						const avatarX = (this.canvasW - avatarSize) / 2
+						const avatarY = 50
+						ctx.setFillStyle('#e0e0e0')
+						ctx.beginPath()
+						ctx.arc(avatarX + avatarSize / 2, avatarY + avatarSize / 2, avatarSize / 2, 0, 2 * Math.PI)
+						ctx.fill()
+					}
+				} else {
+					// 没有头像时绘制默认头像圆圈
+					const avatarSize = 60
+					const avatarX = (this.canvasW - avatarSize) / 2
+					const avatarY = 50
+					ctx.setFillStyle('#e0e0e0')
+					ctx.beginPath()
+					ctx.arc(avatarX + avatarSize / 2, avatarY + avatarSize / 2, avatarSize / 2, 0, 2 * Math.PI)
+					ctx.fill()
+				}
+				
+				// 绘制用户昵称
+				if (this.userInfo.nickName) {
+					ctx.setFillStyle('#333333')
+					ctx.setFontSize(16)
+					ctx.setTextAlign('center')
+					ctx.fillText(this.userInfo.nickName || '用户', this.canvasW / 2, 140)
+				}
+				
+				// 获取二维码图片并绘制
+				try {
+					const qrCodeImagePath = await this.getQRCodeImage()
+					if (qrCodeImagePath) {
+						const qrSize = 120
+						const qrX = (this.canvasW - qrSize) / 2
+						const qrY = 160
+						
+						ctx.drawImage(qrCodeImagePath, qrX, qrY, qrSize, qrSize)
+					}
+				} catch (e) {
+					console.log('二维码绘制失败', e)
+				}
+				
+				// 绘制底部文案
+				ctx.setFillStyle('#666666')
+				ctx.setFontSize(14)
+				ctx.setTextAlign('center')
+				ctx.fillText('扫码关注，享受专业服务', this.canvasW / 2, 310)
+				
+				// 执行绘制
+				ctx.draw(false, () => {
+					// 导出图片
+					setTimeout(() => {
+						this.canvasToTempFilePath()
+					}, 1000)
+				})
+			},
+			
+			// 下载网络图片到本地
+			downloadImage(url) {
+				return new Promise((resolve, reject) => {
+					// H5环境下直接使用网络图片URL，避免跨域问题
+					// #ifdef H5
+					resolve(url)
+					// #endif
+					
+					// #ifndef H5
+					uni.downloadFile({
+						url: url,
+						success: (res) => {
+							if (res.statusCode === 200) {
+								resolve(res.tempFilePath)
+							} else {
+								reject('下载失败')
+							}
+						},
+						fail: reject
+					})
+					// #endif
+				})
+			},
+			
+			// 获取二维码图片
+			getQRCodeImage() {
+				return new Promise((resolve, reject) => {
+					if (this.$refs.qrCodeComponent) {
+						this.$refs.qrCodeComponent.toTempFilePath({
+							success: (res) => {
+								resolve(res.tempFilePath)
+							},
+							fail: (err) => {
+								reject(err)
+							}
+						})
+					} else {
+						reject('二维码组件不存在')
+					}
+				})
+			},
+			
+			// 画布导出为图片
+			canvasToTempFilePath() {
+				// #ifdef H5
+				// H5环境下直接转换canvas
+				setTimeout(() => {
+					this.convertCanvasToBase64()
+				}, 500)
+				// #endif
+				
+				// #ifndef H5
+				uni.canvasToTempFilePath({
+					canvasId: 'myCanvas',
+					success: (res) => {
+						this.tempFilePath = res.tempFilePath
+						console.log('海报生成成功', res.tempFilePath)
+					},
+					fail: (err) => {
+						console.log('海报生成失败', err)
+						uni.showToast({
+							title: '海报生成失败',
+							icon: 'none'
+						})
+					}
+				}, this)
+				// #endif
+			},
+			
+			// 将canvas转换为base64图片
+			convertCanvasToBase64() {
+				// #ifdef H5
+				try {
+					// 获取canvas元素
+					const canvasElement = document.querySelector('#myCanvas')
+					if (!canvasElement) {
+						console.error('找不到canvas元素')
+						this.retryConvert()
+						return
+					}
+					
+					// 检查是否是canvas元素
+					if (canvasElement.tagName.toLowerCase() !== 'canvas') {
+						console.error('元素不是canvas')
+						this.retryConvert()
+						return
+					}
+					
+					// 等待canvas绘制完成
+					setTimeout(() => {
+						try {
+							// 转换为base64
+							const dataURL = canvasElement.toDataURL('image/png', 1.0)
+							if (dataURL && dataURL.startsWith('data:image')) {
+								this.tempFilePath = dataURL
+								console.log('海报生成成功')
+								this.retryCount = 0 // 重置重试次数
+							} else {
+								throw new Error('生成的图片数据无效')
+							}
+						} catch (e) {
+							console.error('转换图片失败', e)
+							this.retryConvert()
+						}
+					}, 200)
+					
+				} catch (e) {
+					console.error('转换图片失败', e)
+					this.retryConvert()
+				}
+				// #endif
+			},
+			
+			// 重试转换
+			retryConvert() {
+				if (this.retryCount < this.maxRetry) {
+					this.retryCount++
+					console.log(`重试转换图片，第${this.retryCount}次`)
+					setTimeout(() => {
+						this.convertCanvasToBase64()
+					}, 500)
+				} else {
+					console.log('重试次数已达上限，使用备用方法')
+					this.fallbackCanvasConvert()
+				}
+			},
+			
+			// 备用的canvas转换方法
+			fallbackCanvasConvert() {
+				uni.canvasToTempFilePath({
+					canvasId: 'myCanvas',
+					success: (res) => {
+						this.tempFilePath = res.tempFilePath
+						console.log('海报生成成功（备用方法）', res.tempFilePath)
+					},
+					fail: (err) => {
+						console.log('海报生成失败', err)
+						uni.showToast({
+							title: '海报生成失败',
+							icon: 'none'
+						})
+					}
+				}, this)
+			},
+			
+			// 保存图片 - H5环境提示用户长按
+			handleSaveImage() {
+				if (!this.tempFilePath) {
+					uni.showToast({
+						title: '图片还未生成完成',
+						icon: 'none'
+					})
+					return
+				}
+				
+				// H5环境下提示用户长按保存
+				uni.showModal({
+					title: '保存图片',
+					content: '请长按上方图片，选择"保存图片"即可保存到手机',
+					showCancel: false,
+					confirmText: '知道了'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.placard {
+		display: flex;
+		align-items: start;
+		justify-content: center;
+		min-height: 100vh;
+		background-color: #f5f5f5;
+		padding: 48rpx 26rpx;
+		
+		.placard-content {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			
+			.img-box {
+				background-color: #fff;
+				border-radius: 10px;
+				box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1);
+				overflow: hidden;
+				margin-bottom: 20px;
+				
+				img {
+					user-select: none;
+					-webkit-user-select: none;
+					-webkit-touch-callout: default;
+				}
+			}
+			
+			.loading-box {
+				background-color: #fff;
+				border-radius: 10px;
+				box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1);
+				margin-bottom: 20px;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				
+				.loading-content {
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					
+					.loading-spinner {
+						width: 30px;
+						height: 30px;
+						border: 3px solid #f3f3f3;
+						border-top: 3px solid #84A73F;
+						border-radius: 50%;
+						animation: spin 1s linear infinite;
+						margin-bottom: 10px;
+					}
+					
+					.loading-text {
+						color: #666;
+						font-size: 14px;
+					}
+				}
+			}
+			
+			.add-btn {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 100%;
+			
+				.btn {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 80%;
+					height: 40px;
+					border-radius: 20px;
+					color: white;
+					font-size: 16px;
+					background: linear-gradient(to right, #84A73F, #D8FF8F);
+					margin-top: 20px;
+					box-shadow: 0 4px 12px rgba(132, 167, 63, 0.3);
+					cursor: pointer;
+					
+					&:active {
+						transform: scale(0.98);
+						transition: transform 0.1s;
+					}
+				}
+			}
+		}
+	}
+	
+	.hidden-canvas {
+		opacity: 0;
+		position: fixed;
+		top: -9999px;
+		left: -9999px;
+		pointer-events: none;
+	}
+	
+	.qrcode {
+		position: fixed;
+		top: -9999px;
+		left: -9999px;
+		opacity: 0;
+		pointer-events: none;
+	}
+	
+	@keyframes spin {
+		0% { transform: rotate(0deg); }
+		100% { transform: rotate(360deg); }
+	}
+</style>

pages_order/mine/runningWater.vue

@@ -4,13 +4,8 @@
 		<navbar title="提现记录" leftClick @leftClick="$utils.navigateBack" color="#fff" />
 
 		<view class="tools">
-			<uv-datetime-picker 
-				ref="datetimePicker" 
-				v-model="selectedTime" 
-				mode="year-month" 
-				confirmColor="#84A73F"
-				@confirm="onTimeChange"
-			></uv-datetime-picker>
+			<uv-datetime-picker ref="datetimePicker" v-model="selectedTime" mode="year-month" confirmColor="#84A73F"
+				@confirm="onTimeChange"></uv-datetime-picker>
 			<button plain class="flex btn" @click="openTimePicker">
 				<text>{{ displaySelectedTime }}</text>
 				<image class="btn-icon" src="../static/runningWater/icon-arrow.png" mode="widthFix"></image>
@@ -19,16 +14,15 @@
 
 		<view class="card list">
 			<template v-if="list.length">
-				<view class="flex list-item" 
-					v-for="(item, index) in list"
-					:key="index"
-				>
-					<image class="list-item-icon" src="../static/runningWater/icon-commission.png" mode="widthFix"></image>
+				<view class="flex list-item" v-for="(item, index) in list" :key="index">
+					<image class="list-item-icon" src="../static/runningWater/icon-commission.png" mode="widthFix">
+					</image>
 					<view class="list-item-info">
 						<view class="highlight">佣金提现</view>
 						<view>{{ item.createTime }}</view>
 					</view>
-					<view class="list-item-value">{{ `-${item.money}` }}</view>
+					<view class="list-item-value">{{ `-${item.amount}` }}</view>
+					<view class="uni-color-btn" @click="withdraw(item)" v-if="item.status == 0">领取</view>
 				</view>
 			</template>
 			<template v-else>
@@ -48,12 +42,12 @@
 				selectedTime: new Date(),
 
 				x: ['+', '-', '-', '+'],
-				mixinsListApi: "getWaterPageList",
+				mixinsListApi: "queryCashoutLog", //getWaterPageList
 				beforeDate: new Date(), //开始日期
 				afterDate: new Date(), //结束日期
-					
-				totalMoney : 0,
-				totalWithdraw : 0,
+
+				totalMoney: 0,
+				totalWithdraw: 0,
 			}
 		},
 		computed: {
@@ -61,6 +55,8 @@
 				return this.$dayjs(this.selectedTime).format("YYYY年M月")
 			}
 		},
+		onLoad() {
+		},
 		methods: {
 			//打开日历
 			openCalendars() {
@@ -71,9 +67,9 @@
 
 			// 选择了日期
 			handleSelectCalendars(day) {
-				
+
 				console.log(day);
-				
+
 				// let beforeDate = this.getYearMonth(day?.range?.before)
 				// let afterDate = this.getYearMonth(day?.range?.after)
 				// this.beforeYear = beforeDate.year;
@@ -81,8 +77,8 @@
 				// this.afterYear = afterDate.year;
 				// this.afterMonth = afterDate.month;
 			},
-			
-			getDataThen(list, total, result){
+
+			getDataThen(list, total, result) {
 				this.totalMoney = result.totalMoney
 				this.totalWithdraw = result.totalWithdraw
 				this.list = result.page.records
@@ -96,6 +92,144 @@
 				// todo
 				console.log('--onTimeChange', e)
 			},
+			requestMerchantTransferH5(item, fn) {
+				// #ifdef H5
+				// 使用Vue原型上的jWeixin
+				const jWeixin = this.$jWeixin
+				if (!jWeixin) {
+					console.error('jWeixin未初始化')
+					uni.showToast({
+						title: '微信环境异常',
+						icon: 'none'
+					})
+					return
+				}
+
+				jWeixin.ready(() => {
+					jWeixin.checkJsApi({
+						jsApiList: ['requestMerchantTransfer'],
+						success: (res) => {
+							if (res.checkResult['requestMerchantTransfer']) {
+								// H5环境下使用WeixinJSBridge
+								if (typeof WeixinJSBridge !== 'undefined') {
+									WeixinJSBridge.invoke('requestMerchantTransfer', {
+										appId: this.$config.appId,
+										mchId: this.$config.mchId,
+										package: item.packageInfo,
+									}, (res) => {
+										if (res.err_msg === 'requestMerchantTransfer:ok') {
+											// 提现成功后的处理
+											fn && fn()
+										} else {
+											console.log('提现失败:', res)
+											uni.showToast({
+												title: '提现失败，请稍后再试',
+												icon: 'none'
+											})
+										}
+									})
+								} else {
+									console.error('WeixinJSBridge未找到')
+									uni.showToast({
+										title: '请在微信中打开',
+										icon: 'none'
+									})
+								}
+							} else {
+								uni.showToast({
+									title: '你的微信版本过低，请更新至最新版本',
+									icon: 'none'
+								})
+							}
+						},
+						fail: (error) => {
+							console.error('checkJsApi失败:', error)
+							uni.showToast({
+								title: '微信接口检查失败',
+								icon: 'none'
+							})
+						}
+					})
+				})
+
+				jWeixin.error((res) => {
+					console.error('微信配置失败:', res)
+					uni.showToast({
+						title: '微信配置失败',
+						icon: 'none'
+					})
+				})
+				// #endif
+			},
+			withdraw(item) {
+				// #ifdef H5
+				// 检查是否在微信环境
+				if (!this.isInWechat()) {
+					uni.showToast({
+						title: '请在微信中打开',
+						icon: 'none'
+					})
+					return
+				}
+				
+				// H5环境下使用专门的H5提现方法
+				this.requestMerchantTransferH5(item, () => {
+					this.$store.commit('getUserInfo')
+					this.$store.commit('getRiceInfo')
+					this.$api('getMoney', {
+						id: item.id,
+					}).then(res => {
+						this.getData()
+					})
+				})
+				return
+				// #endif
+
+				// #ifdef MP-WEIXIN
+				// 小程序环境下的处理
+				// 拉起微信收款确认页面
+				if (!wx.canIUse('requestMerchantTransfer')) {
+					wx.showModal({
+						content: '你的微信版本过低，请更新至最新版本。',
+						showCancel: false,
+					});
+					return
+				}
+
+				// 在真机环境中，调用API
+				wx.requestMerchantTransfer({
+					appId: wx.getAccountInfoSync().miniProgram.appId,
+					mchId: this.$config.mchId,
+					package: item.packageInfo,
+					success: (res) => {
+						this.$store.commit('getUserInfo')
+						this.$store.commit('getRiceInfo')
+
+						this.$api('getMoney', {
+							id: item.id,
+						}).then(res => {
+							this.getData()
+						})
+					},
+					fail: (res) => {
+						console.log('fail:', res);
+						uni.showToast({
+							title: '提现失败，请稍后再试',
+							icon: 'none'
+						})
+					},
+					complete: (res) => {
+						console.log('requestMerchantTransfer完成:', res);
+					}
+				});
+				// #endif
+			},
+			// #ifdef H5
+			// 检查是否在微信环境
+			isInWechat() {
+				const ua = navigator.userAgent.toLowerCase()
+				return ua.indexOf('micromessenger') !== -1
+			},
 		}
 	}
 </script>
@@ -104,12 +238,19 @@
 	.page {
 		background-color: $uni-bg-color;
 		min-height: 100vh;
-				
+
 		/deep/ .nav-bar__view {
 			background-image: linear-gradient(#84A73F, #D8FF8F);
 		}
 	}
 
+	.uni-color-btn {
+		padding: 10rpx 20rpx;
+		margin: 0;
+		font-size: 26rpx;
+		margin-left: 20rpx;
+	}
+
 	.tools {
 		background-color: $uni-fg-color;
 		padding: 25rpx 42rpx;
@@ -128,7 +269,7 @@
 			}
 		}
 	}
-	
+
 	.list {
 		margin: 9rpx 13rpx;
 		padding: 31rpx 20rpx;

pages_order/mine/voucher.vue

@@ -33,20 +33,16 @@
     <template v-if="current == 0" >
       <view class="list voucher">
         <!-- todo: check only show status == 0? -->
-        <voucherCard class="list-item"
-          v-for="item in list"
-          :key="item.id"
-          :data="item"
-        ></voucherCard>
+        <view class="list-item" v-for="item in list" :key="item.id">
+          <voucherCard :data="item" ></voucherCard>
+        </view>
       </view>
     </template>
     <template v-else-if="current == 1" >
       <view class="list store">
-        <storeCard class="list-item"
-          v-for="item in list"
-          :key="item.id"
-          :data="item"
-        ></storeCard>
+        <view class="list-item" v-for="item in list" :key="item.id">
+          <storeCard :data="item" ></storeCard>
+        </view>
       </view>
     </template>
   </view>
@@ -108,7 +104,7 @@
         this.list = []
 
         this.getData()
-      }
+      },
     },
   }
 </script>

pages_order/mine/withdraw.vue

@@ -7,14 +7,14 @@
 
 			<!-- 佣金信息 -->
 			<view class="info">
-				<image class="info-bg" src="../static/withdraw/bg.png"></image>
+				<image class="info-bg" src="/pages_order/static/withdraw/bg.png"></image>
 
 				<view class="info-content">
-					<view class="label">总佣金余额（元）</view>
-					<view class="value">{{ riceInfo.canWithdraw || 0 }}</view>
+					<view class="label">佣金（元）</view>
+					<view class="value">{{ userInfo.recommendAmount || 0 }}</view>
 					<view class="flex desc">
 						<!-- todo: 对接接口字段 -->
-						<view>{{ `累积提现：${123 || 0} 元` }}</view>
+						<view>{{ `累积提现：${userInfo.cashoutSum || 0} 元` }}</view>
 						<button plain class="btn" @click="toRunningWater">
 							<text>提现记录</text>
 							<image class="btn-icon" src="@/static/image/center/icon-arrow.png" mode="widthFix"></image>
@@ -68,11 +68,12 @@
 
 <script>
 	import mixinsList from '@/mixins/list.js'
+	import mixinsConfigList from '@/mixins/configList.js'
 	import {
 		mapState
 	} from 'vuex'
 	export default {
-		mixins: [mixinsList],
+		mixins: [mixinsList, mixinsConfigList],
 		computed: {
 			...mapState(['userInfo', 'riceInfo']),
 		},
@@ -94,11 +95,20 @@
 				}
 			}
 		},
+		onLoad() {
+		},
 		onShow() {
 			this.$store.commit('getUserInfo')
 			this.$store.commit('getRiceInfo')
 		},
 		methods: {
+			// #ifdef H5
+			// 检查是否在微信环境
+			isInWechat() {
+				const ua = navigator.userAgent.toLowerCase()
+				return ua.indexOf('micromessenger') !== -1
+			},
+			// #endif
 			withdraw() { //立即提现
 				if (!this.form.name) {
 					uni.showToast({
@@ -108,14 +118,20 @@
 
 					return
 				}
-
-				// todo
-				if (this.form.money < 300) {
+				if (this.form.money < 1) {
 					return uni.showToast({
-						title: '未满300元不可提现哦！',
+						title: '提现只能是整数必须大于1！',
 						icon: 'none'
 					})
 				}
+
+				// todo
+				// if (this.form.money < 300) {
+				// 	return uni.showToast({
+				// 		title: '未满300元不可提现哦！',
+				// 		icon: 'none'
+				// 	})
+				// }
 				let isOk = this.parameterVerification();
 				if (isOk && !isOk.auth) {
 					return uni.showToast({
@@ -123,17 +139,191 @@
 						icon: 'none'
 					})
 				}
-				this.$api('recharge', this.form, res => {
-					if (res.code == 200) {
+				// this.$api('recharge', this.form, res => {
+				// 	if (res.code == 200) {
+				// 		uni.showToast({
+				// 			title: '提现成功',
+				// 			icon: 'none'
+				// 		})
+				// 		this.$store.commit('getUserInfo')
+				// 		this.$store.commit('getRiceInfo')
+				// 	}
+				// })
+				
+				
+				// 显示提交中状态
+				uni.showLoading({
+				    title: '提交中...'
+				})
+				
+				// 提现
+				this.$api('cashout', { transferAmount: this.form.money, userName: this.form.name }, res => {
+				    uni.hideLoading()
+				    if (res.code === 200) {
+				        // 处理待收款用户确认的情况
+				        if (res.result && res.result.state === 'WAIT_USER_CONFIRM' && res.result.packageInfo && res.result.outBillNo) {
+							let data = res.result
+							
+							// #ifdef H5
+							// H5环境下检查微信环境
+							if (!this.isInWechat()) {
+								uni.showToast({
+									title: '请在微信中打开',
+									icon: 'none'
+								})
+								return
+							}
+							
+							// H5环境下使用专门的H5提现方法
+							this.requestMerchantTransferH5(res.result.packageInfo, data.outBillNo)
+							return
+							// #endif
+							
+							// #ifdef MP-WEIXIN
+				            // 拉起微信收款确认页面
+				            if (!wx.canIUse('requestMerchantTransfer')) {
+				                wx.showModal({
+				                    content: '你的微信版本过低，请更新至最新版本。',
+				                    showCancel: false,
+				                });
+				                return
+				            }
+				            
+				            // 在真机环境中，调用API
+				            wx.requestMerchantTransfer({
+								mchId: this.$config.mchId,
+				                appId: wx.getAccountInfoSync().miniProgram.appId,
+				                package: res.result.packageInfo,
+				                success: (res) => {
+				                    uni.showToast({
+				                        title: '提现申请已提交',
+				                        icon: 'success'
+				                    })
+				                    this.form.money = ''
+				                    this.form.name = ''
+									
+									this.$api('getMoney', {
+										id : data.outBillNo,
+									}).then(res => {
+										this.$store.commit('getUserInfo')
+										this.$store.commit('getRiceInfo')
+									})
+				                },
+				                fail: (res) => {
+				                    console.log('fail:', res);
+				                    uni.showToast({
+				                        title: '提现失败，请稍后再试',
+				                        icon: 'none'
+				                    })
+				                },
+				                complete: (res) => {
+				                    console.log('requestMerchantTransfer完成:', res);
+				                }
+				            });
+							// #endif
+				        } else {
+				            uni.showToast({
+				                title: '提现成功',
+				                icon: 'success'
+				            })
+				            this.$store.commit('getUserInfo')
+				            this.form.money = ''
+				            this.form.name = ''
+				        }
+				    }else{
 						uni.showToast({
-							title: '提现成功',
-							icon: 'none'
+						    title: res.message,
+						    icon: 'none'
 						})
-						this.$store.commit('getUserInfo')
-						this.$store.commit('getRiceInfo')
 					}
 				})
+				
+			},
+			
+			// #ifdef H5
+			// H5环境下的微信收款确认
+			requestMerchantTransferH5(packageInfo, outBillNo, callback) {
+				// 使用Vue原型上的jWeixin
+				const jWeixin = this.$jWeixin
+				if (!jWeixin) {
+					console.error('jWeixin未初始化')
+					uni.showToast({
+						title: '微信环境异常',
+						icon: 'none'
+					})
+					return
+				}
+
+				jWeixin.ready(() => {
+					jWeixin.checkJsApi({
+						jsApiList: ['requestMerchantTransfer'],
+						success: (res) => {
+							if (res.checkResult['requestMerchantTransfer']) {
+								// H5环境下使用WeixinJSBridge
+								if (typeof WeixinJSBridge !== 'undefined') {
+									WeixinJSBridge.invoke('requestMerchantTransfer', {
+										appId: this.$config.appId,
+										mchId: this.$config.mchId,
+										package: packageInfo,
+									}, (res) => {
+										if (res.err_msg === 'requestMerchantTransfer:ok') {
+											// 提现成功后的处理
+											uni.showToast({
+												title: '提现申请已提交',
+												icon: 'success'
+											})
+											this.form.money = ''
+											this.form.name = ''
+											
+											this.$api('getMoney', {
+												id: outBillNo,
+											}).then(res => {
+												this.$store.commit('getUserInfo')
+												this.$store.commit('getRiceInfo')
+											})
+											
+											callback && callback()
+										} else {
+											console.log('提现失败:', res)
+											uni.showToast({
+												title: '提现失败，请稍后再试',
+												icon: 'none'
+											})
+										}
+									})
+								} else {
+									console.error('WeixinJSBridge未找到')
+									uni.showToast({
+										title: '请在微信中打开',
+										icon: 'none'
+									})
+								}
+							} else {
+								uni.showToast({
+									title: '你的微信版本过低，请更新至最新版本',
+									icon: 'none'
+								})
+							}
+						},
+						fail: (error) => {
+							console.error('checkJsApi失败:', error)
+							uni.showToast({
+								title: '微信接口检查失败',
+								icon: 'none'
+							})
+						}
+					})
+				})
+
+				jWeixin.error((res) => {
+					console.error('微信配置失败:', res)
+					uni.showToast({
+						title: '微信配置失败',
+						icon: 'none'
+					})
+				})
 			},
+			// #endif
 
 			parameterVerification() { //验证用户参数合法性
 				let {

pages_order/order/createOrder.vue

@@ -115,7 +115,6 @@
 			}
 		},
 		onShow() {
-			this.getCouponList()
 		},
 		methods: {
 			//获取优惠券列表
@@ -125,6 +124,9 @@
 			// 打开优惠券选择
 			openCoupon() {
 				this.$refs.couponPopup.open('bottom')
+				this.$nextTick(() => {
+					this.getCouponList()
+				})
 			},
 			// 选择优惠券
 			selectCoupon(e) {
@@ -172,7 +174,16 @@
 
 					} else { // 微信支付
 						console.log('--发起支付接口回调', res)
+						
+						// #ifdef MP-WEIXIN
 						await uni.requestPaymentWxPay(res)
+						// #endif
+						
+						
+						// #ifdef H5
+						console.log('$wxPay');
+						await this.$wxPay(res)
+						// #endif
 					}
 
 					uni.showToast({
@@ -181,7 +192,7 @@
 					})
 
 					setTimeout(uni.redirectTo, 700, {
-							url: '/pages/index/order'
+						url: '/pages/index/order'
 					})
 				} catch (err) {
 				}

pages_order/order/verifyOrder.vue

@@ -23,8 +23,8 @@
 			<view class="card info">
 				<view class="info-header">核销信息</view>
 				<view class="flex flex-column info-content">
-					<view class="" style="margin: 20rpx;">
-						<uv-qrcode ref="qrcode" size="300px" :value="`${orderDetail.id},0`"></uv-qrcode>
+					<view class="info-qr">
+						<uv-qrcode ref="qrcode" size="279rpx" :value="`${orderDetail.id},0`"></uv-qrcode>
 					</view>
 					
 					<view class="info-no">{{ `订单号：${orderDetail.id}` }}</view>
@@ -184,8 +184,8 @@
 		}
 
 		&-qr {
-			width: 279rpx;
-			height: auto;
+			// width: 279rpx;
+			// height: auto;
 			margin-top: 57rpx;
 		}
 

pages_order/product/productDetail.vue

@@ -1,302 +1,343 @@
 <template>
-	<view class="page">
-		<!-- 导航栏 -->
-		<navbar title="商品详情" leftClick @leftClick="$utils.navigateBack" color="#fff" />
-
-		<uv-swiper :list="bannerList" indicator indicatorMode="dot" height="475rpx"></uv-swiper>
-
-		<view class="overview">
-			<view class="flex sale">
-				<view class="flex price" :class="[role]">
-          <view>
-						<text class="price-unit">￥</text>
-						<text>{{ productDetail.price }}</text>
-					</view>
-					
-          <view class="flex tag" v-if="role">
-            <image class="icon" :src="vipInfo.massageVipCombo.imagePrice"></image>
-            <text>{{ vipInfo.massageVipCombo.title }}</text>
-          </view>
-
-				</view>
-				<view>
-          <text>{{ `已售出：${productDetail.sales}单` }}</text>
-				</view>
-			</view>
-			<view class="title">
-				<text>{{ productDetail.title }}</text>
-			</view>
-			<view class="flex desc">
-				<view v-for="tag in tags" :key="tag" class="flex tag">
-					<view class="dot"></view>
-					<text>{{ tag }}</text>
-				</view>
-			</view>
-		</view>
-
-		
-		<!-- 商品详情 -->
-		<view class="detail">
-			<view class="header">
-				<cardTitle>商品详情</cardTitle>
-			</view>
-			<uv-parse :content="productDetail.details"></uv-parse>
-		</view>
-
-		<!-- 分享和购买按钮 -->
-		<view class="flex bar">
-			<button plain class="flex flex-column btn btn-share" open-type="share">
-				<image class="btn-share-icon" src="../static/productDetail/icon-share.png"></image>
-				<text>分享</text>
-			</button>
-			<view class="flex count">
-				<text>合计：</text>
-				<view class="price">
-					<text class="price-unit">¥</text>
-					<!-- todo: check -->
-					<text>{{ productDetail.price }}</text>
-				</view>
-			</view>
-			<button plain class="btn btn-pay" @click="submit">立即支付</button>
-		</view>
-	</view>
+    <view class="page">
+        <!-- 导航栏 -->
+        <navbar title="商品详情" leftClick @leftClick="$utils.navigateBack" color="#fff" />
+
+        <uv-swiper :list="bannerList" indicator indicatorMode="dot" height="475rpx"></uv-swiper>
+
+        <view class="overview">
+            <view class="flex sale">
+                <view class="flex price" :class="[role]">
+                    <view>
+                        <text class="price-unit">￥</text>
+                        <text>{{ productDetail.price }}</text>
+                    </view>
+
+                    <view class="flex tag" v-if="role">
+                        <image class="icon" :src="vipInfo.massageVipCombo.imagePrice"></image>
+                        <text>{{ vipInfo.massageVipCombo.title }}</text>
+                    </view>
+
+                </view>
+                <view>
+                    <text>{{ `已售出：${productDetail.sales}单` }}</text>
+                </view>
+            </view>
+            <view class="title">
+                <text>{{ productDetail.title }}</text>
+            </view>
+            <view class="flex desc">
+                <view v-for="tag in tags" :key="tag" class="flex tag">
+                    <view class="dot"></view>
+                    <text>{{ tag }}</text>
+                </view>
+            </view>
+        </view>
+
+
+        <!-- 商品详情 -->
+        <view class="detail">
+            <view class="header">
+                <cardTitle>商品详情</cardTitle>
+            </view>
+            <uv-parse :content="productDetail.details"></uv-parse>
+        </view>
+
+        <!-- 分享和购买按钮 -->
+        <view class="flex bar">
+            <!-- #ifdef H5 -->
+            <button plain class="flex flex-column btn btn-share" @click="handleShare">
+                <image class="btn-share-icon" src="../static/productDetail/icon-share.png"></image>
+                <text>分享</text>
+            </button>
+            <!-- #endif -->
+
+            <!-- #ifdef MP-WEIXIN -->
+            <button plain class="flex flex-column btn btn-share" open-type="share">
+                <image class="btn-share-icon" src="../static/productDetail/icon-share.png"></image>
+                <text>分享</text>
+            </button>
+            <!-- #endif -->
+
+            <view class="flex count">
+                <text>合计：</text>
+                <view class="price">
+                    <text class="price-unit">¥</text>
+                    <!-- todo: check -->
+                    <text>{{ productDetail.price }}</text>
+                </view>
+            </view>
+            <button plain class="btn btn-pay" @click="submit">立即支付</button>
+        </view>
+    </view>
 </template>
 
 <script>
-  import { mapGetters, mapState } from 'vuex'
-
-	import cardTitle from '@/components/base/cardTitle.vue'
-
-	export default {
-		components: {
-			cardTitle,
-		},
-		data() {
-			return {
-				productDetail: {
-					image: '',
-					details: '',
-				},
-				id: 0,
-			}
-		},
-		computed: {
-			...mapGetters(['role']),
-			...mapState(['vipInfo']),
-			// todo: check
-			bannerList() {
-				const { image } = this.productDetail
-
-				if (!image) {
-					return []
-				}
-
-				return Array.isArray(image) ? image : image.split(',')
-			},
-			tags() {
-				const { tag } = this.productDetail
-
-				return tag?.split('、') || []
-			}
-		},
-		onLoad(args) {
-			this.id = args.id
-
-			this.fetchProductDetail(this.id)
-		},
-		onShow() {
-		},
+import { mapGetters, mapState } from 'vuex'
+
+import cardTitle from '@/components/base/cardTitle.vue'
+
+export default {
+    components: {
+        cardTitle,
+    },
+    data() {
+        return {
+            productDetail: {
+                image: '',
+                details: '',
+            },
+            id: 0,
+        }
+    },
+    computed: {
+        ...mapGetters(['role']),
+        ...mapState(['vipInfo']),
+        // todo: check
+        bannerList() {
+            const { image } = this.productDetail
+
+            if (!image) {
+                return []
+            }
+
+            return Array.isArray(image) ? image : image.split(',')
+        },
+        tags() {
+            const { tag } = this.productDetail
+
+            return tag?.split('、') || []
+        }
+    },
+    onLoad(args) {
+        this.id = args.id
+        this.fetchProductDetail(this.id)
+        
+        // 处理分享ID参数
+        if (args.shareId) {
+            uni.setStorageSync('shareId', args.shareId)
+        }
+    },
+    onShow() {
+        // 页面显示时重新设置分享内容
+        this.updateShareContent()
+    },
     onShareAppMessage(res) {
-      const {
-        title,
-      } = this.productDetail
-
-      let o = {
-        title: title,
-				// todo: check
-				imageUrl: bannerList[0],
-        query: `id=${this.productDetail.id}`,
-      }
-
-      return o
+        // 小程序分享：返回商品特定的分享内容
+        return {
+            title: this.productDetail.title || '愈然工坊',
+            imageUrl: this.bannerList[0] || '',
+            path: `/pages_order/product/productDetail?id=${this.productDetail.id}${this.userInfo.id ? '&shareId=' + this.userInfo.id : ''}`,
+        }
     },
-		methods: {
-			// 获取商品
-			async fetchProductDetail(id) {
-				try {
-					this.productDetail = await this.$fetch('queryProductDetail', { id })
-				} catch (err) {
-
-				}
-			},
-			// 立即下单
-			submit() {
-				this.$store.commit('setPayOrderProduct', [
-					this.productDetail
-				])
-
-				this.$utils.navigateTo('/pages_order/order/createOrder')
-			},
-		}
-	}
+    methods: {
+        // #ifdef H5
+        // H5分享处理
+        handleShare() {
+            uni.showToast({
+                title: '请点击右上角分享',
+                icon: 'none'
+            })
+        },
+        // #endif
+        
+        // 更新分享内容
+        updateShareContent() {
+            if (this.productDetail.id) {
+                // 设置商品特定的分享内容到全局分享配置
+                this.Gshare.title = this.productDetail.title || '愈然工坊'
+                this.Gshare.desc = this.productDetail.title || '愈然工坊，温柔呵护每一刻！'
+                this.Gshare.path = `/pages_order/product/productDetail?id=${this.productDetail.id}`
+                this.Gshare.imageUrl = this.bannerList[0] || ''
+                
+                // #ifdef H5
+                // H5环境下重新设置微信分享
+                this.setupWeixinShare()
+                // #endif
+            }
+        },
+        
+        // 获取商品
+        async fetchProductDetail(id) {
+            try {
+                this.productDetail = await this.$fetch('queryProductDetail', { id })
+                
+                // 商品数据加载完成后更新分享内容
+                this.updateShareContent()
+            } catch (err) {
+
+            }
+        },
+        // 立即下单
+        submit() {
+            this.$store.commit('setPayOrderProduct', [
+                this.productDetail
+            ])
+
+            this.$utils.navigateTo('/pages_order/order/createOrder')
+        },
+    }
+}
 </script>
 
 <style scoped lang="scss">
-	$bar-height: 132rpx;
-
-	.page {
-		padding-bottom: calc(#{$bar-height} + env(safe-area-inset-bottom));
-
-		background-color: #F3F3F3;
-		
-		/deep/ .nav-bar__view {
-			background-image: linear-gradient(#84A73F, #D8FF8F);
-		}
-
-		.overview {
-			padding: 16rpx 31rpx 18rpx 24rpx;
-			background-color: $uni-fg-color;
-
-			.sale {
-				justify-content: space-between;
-				color: #949494;
-				font-size: 20rpx;
-
-				.price {
-					color: #FF2A2A;
-					font-size: 45rpx;
-
-					&-unit {
-						font-size: 30rpx;
-						margin-right: 3rpx;
-					}
-					
-					.tag {
-						font-size: 18rpx;
-						font-weight: 700;
-						padding: 9rpx 12rpx 9rpx 19rpx;
-						margin-left: 15rpx;
-
-						.icon {
-							width: 27rpx;
-							height: 19rpx;
-							margin-right: 3rpx;
-						}
-					}
-
-					&.member-personal {
-						color: $uni-color-light;
-						.tag {
-							background-color: rgba($color: #D8FF8F, $alpha: 0.72);
-						}
-					}
-
-					&.member-business {
-						color: #FFB465;
-						.tag {
-							background-color: rgba($color: #FFFBC4, $alpha: 0.72);
-						}
-					}
-				}
-			}
-
-			.title {
-				color: #3A3A3A;
-				font-size: 28rpx;
-				font-weight: 700;
-				margin-top: 15rpx;
-			}
-
-			.desc {
-				justify-content: space-between;
-				margin-top: 20rpx;
-
-				.tag {
-					color: #949494;
-					font-size: 22rpx;
-
-					.dot {
-						width: 8rpx;
-						height: 8rpx;
-						border-radius: 50%;
-						background-color: #949494;
-						margin-right: 16rpx;
-					}
-				}
-			}
-		}
-
-		.detail {
-			margin-top: 12rpx;
-			padding: 18rpx 28rpx;
-			background-color: $uni-fg-color;
-
-			.header {
-				margin-bottom: 30rpx;
-			}
-		}
-		
-		.bar {
-			position: fixed;
-			bottom: 0;
-			left: 0;
-			width: 100vw;
-			height: $bar-height;
-			padding-bottom: env(safe-area-inset-bottom);
-			background-color: $uni-fg-color;
-
-			.count {
-				flex: 1;
-				color: #000000;
-				font-size: 28rpx;
-				margin-left: 29rpx;
-				padding-left: 40rpx;
-				border-left: 1rpx solid #B3997E;
-
-				justify-content: flex-start;
-
-				.price {
-					color: #FF2A2A;
-					font-size: 30rpx;
-
-					&-unit {
-						font-size: 18rpx;
-					}
-				}
-			}
-
-			.btn {
-				border: none;
-				line-height: 1;
-				background-color: transparent;
-				padding: 0;
-				width: auto;
-				height: auto;
-				margin: 0;
-
-				&-share {
-					margin-left: 58rpx;
-					color: #000000;
-					font-size: 22rpx;
-
-					&-icon {
-						width: 48rpx;
-						height: 50rpx;
-						margin-bottom: 11rpx;
-					}
-				}
-
-				&-pay {
-					margin-right: 27rpx;
-					padding: 24rpx 137rpx;
-					color: $uni-text-color-inverse;
-					font-size: 28rpx;
-					border-radius: 44rpx;
-					background-image: linear-gradient(to right, #84A73F, #D8FF8F);
-				}
-
-			}
-		}
-
-	}
+$bar-height: 132rpx;
+
+.page {
+    padding-bottom: calc(#{$bar-height} + env(safe-area-inset-bottom));
+
+    background-color: #F3F3F3;
+
+    /deep/ .nav-bar__view {
+        background-image: linear-gradient(#84A73F, #D8FF8F);
+    }
+
+    .overview {
+        padding: 16rpx 31rpx 18rpx 24rpx;
+        background-color: $uni-fg-color;
+
+        .sale {
+            justify-content: space-between;
+            color: #949494;
+            font-size: 20rpx;
+
+            .price {
+                color: #FF2A2A;
+                font-size: 45rpx;
+
+                &-unit {
+                    font-size: 30rpx;
+                    margin-right: 3rpx;
+                }
+
+                .tag {
+                    font-size: 18rpx;
+                    font-weight: 700;
+                    padding: 9rpx 12rpx 9rpx 19rpx;
+                    margin-left: 15rpx;
+
+                    .icon {
+                        width: 27rpx;
+                        height: 19rpx;
+                        margin-right: 3rpx;
+                    }
+                }
+
+                &.member-personal {
+                    color: $uni-color-light;
+
+                    .tag {
+                        background-color: rgba($color: #D8FF8F, $alpha: 0.72);
+                    }
+                }
+
+                &.member-business {
+                    color: #FFB465;
+
+                    .tag {
+                        background-color: rgba($color: #FFFBC4, $alpha: 0.72);
+                    }
+                }
+            }
+        }
+
+        .title {
+            color: #3A3A3A;
+            font-size: 28rpx;
+            font-weight: 700;
+            margin-top: 15rpx;
+        }
+
+        .desc {
+            justify-content: space-between;
+            margin-top: 20rpx;
+
+            .tag {
+                color: #949494;
+                font-size: 22rpx;
+
+                .dot {
+                    width: 8rpx;
+                    height: 8rpx;
+                    border-radius: 50%;
+                    background-color: #949494;
+                    margin-right: 16rpx;
+                }
+            }
+        }
+    }
+
+    .detail {
+        margin-top: 12rpx;
+        padding: 18rpx 28rpx;
+        background-color: $uni-fg-color;
+
+        .header {
+            margin-bottom: 30rpx;
+        }
+    }
+
+    .bar {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 100vw;
+        height: $bar-height;
+        padding-bottom: env(safe-area-inset-bottom);
+        background-color: $uni-fg-color;
+
+        .count {
+            flex: 1;
+            color: #000000;
+            font-size: 28rpx;
+            margin-left: 29rpx;
+            padding-left: 40rpx;
+            border-left: 1rpx solid #B3997E;
+
+            justify-content: flex-start;
+
+            .price {
+                color: #FF2A2A;
+                font-size: 30rpx;
+
+                &-unit {
+                    font-size: 18rpx;
+                }
+            }
+        }
+
+        .btn {
+            border: none;
+            line-height: 1;
+            background-color: transparent;
+            padding: 0;
+            width: auto;
+            height: auto;
+            margin: 0;
+
+            &-share {
+                margin-left: 58rpx;
+                color: #000000;
+                font-size: 22rpx;
+
+                &-icon {
+                    width: 48rpx;
+                    height: 50rpx;
+                    margin-bottom: 11rpx;
+                }
+            }
+
+            &-pay {
+                margin-right: 27rpx;
+                padding: 24rpx 137rpx;
+                color: $uni-text-color-inverse;
+                font-size: 28rpx;
+                border-radius: 44rpx;
+                background-image: linear-gradient(to right, #84A73F, #D8FF8F);
+            }
+
+        }
+    }
+
+}
 </style>

store/store.js

@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 
+
 Vue.use(Vuex); //vue的插件机制
 
 import api from '@/api/api.js'
@@ -62,6 +63,22 @@ const store = new Vuex.Store({
 			// })
 		},
 		login(state, config) {
+			// #ifdef MP-WEIXIN
+			this.commit('wxLogin', config)
+			// #endif
+			// #ifdef H5
+			this.commit('h5Login', config)
+			// #endif
+		},
+		h5Login(state, config){
+			Vue.set(state, 'userInfo', config.userInfo)
+			uni.setStorageSync('token', config.token)
+			uni.setStorageSync('userInfo', config.userInfo)
+			uni.reLaunch({
+				url: '/pages/index/index'
+			})
+		},
+		wxLogin(state, config){
 			uni.showLoading({
 				title: '登录中...'
 			})
@@ -108,9 +125,11 @@ const store = new Vuex.Store({
 			api('getInfo', res => {
 				if (res.code == 200) {
 					Vue.set(state, 'userInfo', res.result)
+					uni.setStorageSync('userInfo', res.result)
 
 					if (!state.userInfo.nickName ||
-						!state.userInfo.headImage ||
+						!state.userInfo.headImage 
+						||
 						!state.userInfo.phone
 					) {
 						uni.showModal({

uni.scss

@@ -106,5 +106,3 @@ $uni-font-size-paragraph:15px;
 
 $navbar-height: 100rpx;
 $tabbar-height: 120rpx;
-
-$body-height: calc(100vh - #{$tabbar-height} - env(safe-area-inset-bottom) - #{$navbar-height} - var(--status-bar-height) - 20rpx);

utils/h5-fix.js

@@ -0,0 +1,107 @@
+// H5 环境修复
+export function fixH5Environment() {
+	// #ifdef H5
+	try {
+		// 修复路由 meta 属性访问问题
+		const originalGetCurrentPages = getCurrentPages;
+		window.getCurrentPages = function() {
+			try {
+				const pages = originalGetCurrentPages();
+				// 确保页面对象有基本的路由信息
+				if (pages && pages.length > 0) {
+					pages.forEach(page => {
+						if (page && !page.route) {
+							page.route = page.$page?.fullPath || '/';
+						}
+						if (page && page.route && !page.$page?.meta) {
+							page.$page = page.$page || {};
+							page.$page.meta = page.$page.meta || {};
+						}
+					});
+				}
+				return pages;
+			} catch(e) {
+				console.warn('getCurrentPages 修复失败:', e);
+				return [];
+			}
+		};
+
+		// 修复 History API
+		const originalReplaceState = window.history.replaceState;
+		window.history.replaceState = function(state, title, url) {
+			try {
+				// 确保 URL 格式正确
+				if (url && typeof url === 'string') {
+					// 修复格式不正确的 URL
+					if (url.startsWith('https:/#/')) {
+						url = url.replace('https:/#/', window.location.origin + '/#/');
+					}
+					// 如果 URL 不包含完整的域名，添加基础路径
+					if (url.startsWith('#/')) {
+						url = window.location.origin + window.location.pathname + url;
+					}
+				}
+				return originalReplaceState.call(this, state, title, url);
+			} catch(e) {
+				console.warn('History.replaceState 修复失败:', e);
+				return null;
+			}
+		};
+
+		// 修复路由跳转相关问题
+		const originalNavigateTo = uni.navigateTo;
+		uni.navigateTo = function(options) {
+			try {
+				return originalNavigateTo(options);
+			} catch(e) {
+				console.warn('uni.navigateTo 失败:', e);
+				// 降级处理
+				window.location.href = window.location.origin + window.location.pathname + '#' + options.url;
+			}
+		};
+
+		const originalReLaunch = uni.reLaunch;
+		uni.reLaunch = function(options) {
+			try {
+				return originalReLaunch(options);
+			} catch(e) {
+				console.warn('uni.reLaunch 失败:', e);
+				// 降级处理
+				window.location.href = window.location.origin + window.location.pathname + '#' + options.url;
+			}
+		};
+
+		console.log('H5 环境修复完成');
+	} catch(e) {
+		console.warn('H5 环境修复失败:', e);
+	}
+	// #endif
+}
+
+// 修复 URL 参数解析
+export function fixUrlParams() {
+	// #ifdef H5
+	try {
+		function GetQueryString(name) {
+			const url = window.location.href;
+			try {
+				const cs = url.split('?')[1];
+				if (cs) {
+					const cs_arr = cs.split('&');
+					for (let i = 0; i < cs_arr.length; i++) {
+						if (cs_arr[i].split('=')[0] === name) {
+							sessionStorage.setItem('vid', cs_arr[i].split('=')[1]);
+						}
+					}
+				}
+			} catch(e) {
+				console.warn('URL参数解析失败:', e);
+			}
+		}
+
+		GetQueryString('vid');
+	} catch(e) {
+		console.warn('URL参数修复失败:', e);
+	}
+	// #endif
+} 

utils/h5-router-fix.js

@@ -0,0 +1,146 @@
+// H5 路由和环境修复
+// #ifdef H5
+
+// 存储原始方法
+let originalGetCurrentPages;
+let originalHistoryReplaceState;
+let isFixed = false;
+
+// 修复H5环境路由问题的主函数
+export function fixH5Router() {
+	if (isFixed) return;
+	
+	try {
+		// 1. 修复 getCurrentPages 方法
+		if (typeof getCurrentPages === 'function') {
+			originalGetCurrentPages = getCurrentPages;
+			window.getCurrentPages = function() {
+				try {
+					const pages = originalGetCurrentPages();
+					if (pages && Array.isArray(pages)) {
+						// 确保每个页面对象有必要的属性
+						pages.forEach((page, index) => {
+							if (!page.route) {
+								page.route = page.$page?.fullPath || `page_${index}`;
+							}
+							if (!page.options) {
+								page.options = {};
+							}
+							// 确保页面有 meta 属性
+							if (page.$page && !page.$page.meta) {
+								page.$page.meta = {};
+							}
+						});
+					}
+					return pages || [];
+				} catch(e) {
+					console.warn('getCurrentPages 执行失败:', e);
+					return [{
+						route: '/',
+						options: {},
+						$page: { meta: {} }
+					}];
+				}
+			};
+		}
+
+		// 2. 修复 History API
+		if (window.history && window.history.replaceState) {
+			originalHistoryReplaceState = window.history.replaceState;
+			window.history.replaceState = function(state, title, url) {
+				try {
+					// 修复 URL 格式问题
+					if (url && typeof url === 'string') {
+						// 处理错误的 URL 格式
+						if (url.includes('https:/#/')) {
+							url = url.replace(/https:\/+#\//, window.location.origin + '/#/');
+						}
+						// 确保相对路径的正确性
+						if (url.startsWith('#/')) {
+							url = window.location.origin + window.location.pathname + url;
+						}
+						// 处理双斜杠问题
+						url = url.replace(/([^:]\/)\/+/g, '$1');
+					}
+					return originalHistoryReplaceState.call(this, state, title, url);
+				} catch(e) {
+					console.warn('History.replaceState 修复执行失败:', e);
+					// 忽略错误，不执行原方法
+					return null;
+				}
+			};
+		}
+
+		// 3. 添加全局错误处理
+		const originalOnError = window.onerror;
+		window.onerror = function(message, source, lineno, colno, error) {
+			// 过滤已知的H5兼容性错误
+			if (typeof message === 'string') {
+				if (message.includes("Cannot read property 'meta'") ||
+				    message.includes('replaceState') ||
+				    message.includes('showTabBar') ||
+				    message.includes('History')) {
+					console.warn('H5兼容性错误已忽略:', message);
+					return true; // 阻止默认错误处理
+				}
+			}
+			
+			// 其他错误交给原处理器
+			if (originalOnError) {
+				return originalOnError(message, source, lineno, colno, error);
+			}
+			return false;
+		};
+
+		// 4. 修复 URL 哈希处理
+		if (window.location.hash === '' || window.location.hash === '#') {
+			window.location.hash = '#/';
+		}
+
+		// 5. 监听 hashchange 事件，确保路由正常
+		window.addEventListener('hashchange', function(e) {
+			try {
+				const hash = window.location.hash;
+				if (!hash || hash === '#') {
+					window.location.hash = '#/';
+				}
+			} catch(e) {
+				console.warn('hashchange 处理失败:', e);
+			}
+		});
+
+		isFixed = true;
+		console.log('H5 路由修复完成');
+		
+	} catch(e) {
+		console.warn('H5 路由修复失败:', e);
+	}
+}
+
+// 恢复原始方法（用于调试）
+export function restoreH5Router() {
+	if (!isFixed) return;
+	
+	try {
+		if (originalGetCurrentPages) {
+			window.getCurrentPages = originalGetCurrentPages;
+		}
+		if (originalHistoryReplaceState) {
+			window.history.replaceState = originalHistoryReplaceState;
+		}
+		
+		isFixed = false;
+		console.log('H5 路由修复已恢复');
+	} catch(e) {
+		console.warn('H5 路由恢复失败:', e);
+	}
+}
+
+// 页面加载完成后自动执行修复
+if (document.readyState === 'loading') {
+	document.addEventListener('DOMContentLoaded', fixH5Router);
+} else {
+	fixH5Router();
+}
+
+// #endif 

utils/index.js

@@ -13,6 +13,10 @@ import md5 from './lib/md5.js'
 
 // #ifdef H5
 import jWeixin from './lib/jweixin-module.js'
+
+console.log('jWeixin', jWeixin);
+
+
 import { wxPay }  from './pay.js'
 Vue.prototype.$jWeixin = jWeixin
 Vue.prototype.$wxPay = wxPay

utils/pay.js

@@ -1,4 +1,3 @@
-
 // #ifdef H5
 import jWeixin from './lib/jweixin-module.js'
 // #endif
@@ -6,42 +5,43 @@ import jWeixin from './lib/jweixin-module.js'
 /**
  * 调用微信支付
  * @param {Object} res - 支付参数对象，包含appId、timeStamp、nonceStr等必要信息
- * @param {Function} successCallback - 支付成功的回调函数
- * @param {Function} failCallback - 支付失败的回调函数
- * @param {Function} optionCallback - 配置失败的回调函数
+ * @returns {Promise} - 返回Promise对象，resolve表示支付成功，reject表示支付失败
  */
-export function wxPay(res, successCallback, failCallback, optionCallback) {
-	// 配置微信JSSDK
-	jWeixin.config({
-		debug: false,
-		appId: res.result.appId, //必填，公众号的唯一标识
-		jsApiList: ['chooseWXPay'] //必填，需要使用的JS接口列表
-	});
+export function wxPay(res) {
+	return new Promise((resolve, reject) => {
+		// 配置微信JSSDK
+		// jWeixin.config({
+		// 	debug: false,
+		// 	appId: res.result.appId, //必填，公众号的唯一标识
+		// 	jsApiList: ['chooseWXPay'] //必填，需要使用的JS接口列表
+		// });
 
-	// JSSDK配置成功后的回调
-	jWeixin.ready(function() {
-		// 调用微信支付接口
-		jWeixin.chooseWXPay({
-			appId: res.result.appId,
-			timestamp: res.result.timeStamp, // 支付签名时间戳
-			nonceStr: res.result.nonceStr, // 支付签名随机串
-			package: res.result.packageValue, // 统一支付接口返回的prepay_id参数值
-			signType: res.result.signType, // 签名类型，默认为MD5
-			paySign: res.result.paySign, // 支付签名
-			success: function() {
-				successCallback && successCallback();
-			},
-			fail: function(error) {
-				failCallback && failCallback();
-			},
-			cancel : function(){
-				failCallback && failCallback();
-			}
+		// JSSDK配置成功后的回调
+		jWeixin.ready(function() {
+			// 调用微信支付接口
+			jWeixin.chooseWXPay({
+				appId: res.result.appId,
+				timestamp: res.result.timeStamp, // 支付签名时间戳
+				nonceStr: res.result.nonceStr, // 支付签名随机串
+				package: res.result.packageValue, // 统一支付接口返回的prepay_id参数值
+				signType: res.result.signType, // 签名类型，默认为MD5
+				paySign: res.result.paySign, // 支付签名
+				success: function(result) {
+					resolve(result);
+				},
+				fail: function(error) {
+					reject(error);
+				},
+				cancel: function(error) {
+					reject({ type: 'cancel', ...error });
+				}
+			});
 		});
-	});
 
-	// JSSDK配置失败处理
-	jWeixin.error(function(res) {
-		optionCallback && optionCallback()
+		// JSSDK配置失败处理
+		jWeixin.error(function(error) {
+			reject({ type: 'config_error', ...error });
+		});
 	});
 }
+

utils/share.js

@@ -1,11 +1,14 @@
 import api from '@/api/api.js'
 import config from "../config.js"
 import jWeixin from './lib/jweixin-module.js'
+import Vue from 'vue'
 
 function share() { //微信分享
 	//获取签名
 	let data = {
-		url: import.meta.env.VITE_REDIRECT_URI + '/#/'
+		// location.href.split('#')[0])
+		// url: Vue.prototype.$config.redirect + '/#/'
+		url: location.href.split('#')[0]
 	}
 	api('getVipShareSign', data, res => {
 		if (res.code == 200) {
@@ -25,7 +28,9 @@ function share() { //微信分享
 					'updateTimelineShareData',
 					'updateAppMessageShareData',
 					'onMenuShareWeibo',
-					'getLocation'
+					'getLocation',
+					'chooseWXPay',
+					'requestMerchantTransfer',
 				]
 			});
 
@@ -33,9 +38,9 @@ function share() { //微信分享
 				// 微信分享的数据
 				var shareData = {
 					"link": addQueryParams(data.url),
-					"desc": "泰柔到家",
-					"title": "泰柔到家，温柔呵护每一刻！",
-					imgUrl : import.meta.env.VITE_REDIRECT_URI + '/static/share/logo.png',
+					"desc": "愈然工坊",
+					"title": "愈然工坊，温柔呵护每一刻！",
+					imgUrl : Vue.prototype.$config.redirect + '/static/share/logo.png',
 					success: function() {
 						//分享成功可以做相应的数据处理
 						// uni.showToast({